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

@@ -393,10 +393,6 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public DateTime? EndAllocateDate { get; set; }
 
-		public DateTime? BeginSignTime { get; set; }
-
-		public DateTime? EndSignTime { get; set; }
-
         public Guid? RootReReadingTaskId { get; set; }
 
         public string? TaskCode { get; set; }

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

@@ -758,8 +758,6 @@ namespace IRaCIS.Core.Application.Service.Allocation
                .WhereIf(!string.IsNullOrEmpty(queryVisitTask.SubjectCode), t => (t.Subject.Code.Contains(queryVisitTask.SubjectCode) && t.IsAnalysisCreate == false) || (t.BlindSubjectCode.Contains(queryVisitTask.SubjectCode) && t.IsAnalysisCreate))
                .WhereIf(queryVisitTask.BeginAllocateDate != null, t => t.AllocateTime > queryVisitTask.BeginAllocateDate)
                .WhereIf(queryVisitTask.EndAllocateDate != null, t => t.AllocateTime < queryVisitTask.EndAllocateDate!.Value.AddDays(1))
-				  .WhereIf(queryVisitTask.BeginSignTime != null, t => t.SignTime > queryVisitTask.BeginSignTime)
-			   .WhereIf(queryVisitTask.EndSignTime != null, t => t.SignTime < queryVisitTask.EndSignTime!.Value.AddDays(1))
                .ProjectTo<ReadingTaskView>(_mapper.ConfigurationProvider);
 
             var defalutSortArray = new string[] { nameof(VisitTask.IsUrgent) + " desc", nameof(VisitTask.SubjectId), nameof(VisitTask.VisitTaskNum) };

IRaCIS.Core.Application/Service/Document/DTO/SystemDocumentViewModel.cs

@@ -144,10 +144,6 @@ namespace IRaCIS.Core.Application.Contracts
        
         public Guid? UserTypeId { get; set; }
         public Guid? UserId { get; set; }
-
-		public bool? IsConfirmed { get; set; }
-
-		public bool? IsDeleted { get; set; }
     }
 
     ///<summary> SystemDocumentAddOrEdit  列表查询参数模型</summary>

IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs

@@ -409,8 +409,6 @@ namespace IRaCIS.Core.Application.Services
             var unionQuery = trialDocQuery.Union(systemDocQuery)
                 .WhereIf(!string.IsNullOrEmpty(querySystemDocument.Name), t => t.Name.Contains(querySystemDocument.Name))
                 .WhereIf(querySystemDocument.FileTypeId != null, t => t.FileTypeId == querySystemDocument.FileTypeId)
-				.WhereIf(querySystemDocument.IsConfirmed != null, t => t.IsConfirmed == querySystemDocument.IsConfirmed)
-				.WhereIf(querySystemDocument.IsDeleted != null, t => t.IsDeleted == querySystemDocument.IsDeleted)
                 .WhereIf(querySystemDocument.UserTypeId != null, t => t.UserTypeId == querySystemDocument.UserTypeId);
 
             var result = await unionQuery.ToPagedListAsync(querySystemDocument.PageIndex, querySystemDocument.PageSize, querySystemDocument.SortField, querySystemDocument.Asc);

IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs

@@ -175,11 +175,6 @@ namespace IRaCIS.Core.Application.Contracts
 
         public Guid? VisitTaskId { get; set; }
 
-		public bool? IsDicom { get; set; }
-
-		public string? Uploader { get; set; }
-
-		public bool? IsSuccess { get; set; }
     }
 
 

IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs

@@ -457,9 +457,6 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                  .WhereIf(studyQuery.SubjectId != null, t => t.SubjectId == studyQuery.SubjectId)
                  .WhereIf(studyQuery.SubjectVisitId != null, t => t.SubjectId == studyQuery.SubjectVisitId)
                  .WhereIf(studyQuery.SiteId != null, t => t.SiteId == studyQuery.SiteId)
-					.WhereIf(studyQuery.IsDicom != null, t => t.IsDicom == studyQuery.IsDicom )
-					 .WhereIf(!string.IsNullOrWhiteSpace(studyQuery.Uploader), t => t.Uploader.UserName.Contains(studyQuery.Uploader))
-					 .WhereIf(studyQuery.IsSuccess != null, t => t.IsSuccess == studyQuery.IsSuccess)
                  .Select(t => new UnionStudyMonitorModel()
                  {
                      TrialId = t.TrialId,

IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs

@@ -485,11 +485,6 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
         /// </summary>
         public string ReaderUser { get; set; } = string.Empty;
 
-        /// <summary>
-        /// 角色
-        /// </summary>
-		public string RoleName { get; set; } = string.Empty;
-
         /// <summary>
         /// 是否有签名
         /// </summary>

IRaCIS.Core.Application/Service/Inspection/InspectionService.cs

@@ -186,7 +186,6 @@ namespace IRaCIS.Core.Application.Service.Inspection
                    
 
                  .WhereIf(!dto.SubjectInfo.IsNullOrEmpty(), x => x.SubjectCode.Contains(dto.SubjectInfo))
-				 .WhereIf(!dto.RoleName.IsNullOrEmpty(), x => x.RoleName.Contains(dto.RoleName))
                  //.WhereIf(dto.VisitPlanInfo != null&& dto.VisitPlanInfo!=(decimal) 1.11, x => x.VisitNum == dto.VisitPlanInfo)
                  //.WhereIf(dto.VisitPlanInfo != (decimal)1.11,x=>x.InPlan!=null&& x.InPlan==false)
                  .WhereIf(dto.StartTime != null, x => x.CreateTime >= dto.StartTime)

IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs

@@ -762,9 +762,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             }
 
 
-            var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
-
-
             var tableAnswerList = await _readingTableQuestionAnswerRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && (x.Answer == string.Empty || x.Answer == null)
       && x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.State
       )
@@ -824,19 +821,15 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             // 判断是否有pet
             if (await _readingTaskQuestionAnswerRepository.AnyAsync(x => x.ReadingQuestionTrial.QuestionType == QuestionType.ExistPET && x.VisitTaskId == inDto.VisitTaskId && x.Answer == ReadingYesOrNo.Yes.GetEnumInt()))
             {
-
                 List<QuestionType?> required=new List<QuestionType?>() {
 				QuestionType.LiverSUVmax,
 			    QuestionType.MediastinumSUVmax,
 			    QuestionType.SUVmax,
 			    QuestionType.SUVmaxLesion,
 				QuestionType.PET5PS,
+				QuestionType.UptakeChange,
+				QuestionType.EvidenceFocalFDG
 				};
-                if (taskinfo.VisitTaskNum != 0m)
-                {
-					required.Add(QuestionType.UptakeChange);
-					required.Add(QuestionType.EvidenceFocalFDG);
-				}
 
                 if ((await _readingTaskQuestionAnswerRepository.CountAsync(x => required.Contains(x.ReadingQuestionTrial.QuestionType) && x.VisitTaskId == inDto.VisitTaskId && x.Answer != string.Empty)) != required.Count())
                 {
@@ -847,7 +840,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
             if (errorMassage != string.Empty)
             {
-                //errorMassage = errorMassage;
+                errorMassage = _localizer["ReadingCalculate_Questionable"] + errorMassage;
                 throw new BusinessValidationFailedException(errorMassage);
             }
 

IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteSurveyViewModel.cs

@@ -355,11 +355,6 @@ namespace IRaCIS.Core.Application.Contracts
         public DateTime? UpdateTimeBegin { get; set; }
 
         public DateTime? UpdateTimeEnd { get; set; }
-
-        public string? PreliminaryUserName { get; set; }
-
-		public string? ReviewerUserName { get; set; }
-
     }
 
     public class CopyTrialSiteSurveyDTO

IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs

@@ -452,10 +452,7 @@ namespace IRaCIS.Core.Application.Contracts
              .WhereIf(surveyQueryDTO.UpdateTimeBegin != null, t => t.UpdateTime >= surveyQueryDTO.UpdateTimeBegin)
              .WhereIf(surveyQueryDTO.UpdateTimeEnd != null, t => t.UpdateTime <= surveyQueryDTO.UpdateTimeEnd)
 
-			 .ProjectTo<TrialSiteSurveyView>(_mapper.ConfigurationProvider, new { isEn_Us = _userInfo.IsEn_Us })
+             .ProjectTo<TrialSiteSurveyView>(_mapper.ConfigurationProvider, new { isEn_Us = _userInfo.IsEn_Us });
-				 .WhereIf(!string.IsNullOrWhiteSpace(surveyQueryDTO.PreliminaryUserName), t => t.PreliminaryUser.RealName.Contains(surveyQueryDTO.PreliminaryUserName))
-			   .WhereIf(!string.IsNullOrWhiteSpace(surveyQueryDTO.ReviewerUserName), t => t.ReviewerUser.RealName.Contains(surveyQueryDTO.ReviewerUserName))
-			 ;
 
             return await trialSiteSurveyQueryable.ToPagedListAsync(surveyQueryDTO.PageIndex, surveyQueryDTO.PageSize, surveyQueryDTO.SortField, surveyQueryDTO.Asc);
         }