IRaCIS.Core.Application/Service/Common/ExcelExportService.cs

@@ -764,8 +764,6 @@ namespace IRaCIS.Core.Application.Service.Common
             var svExpression = QCCommon.GetSubjectVisitFilter(inQuery.VisitPlanArray);
 
             var query = _subjectVisitRepository.Where(x => x.TrialId == inQuery.TrialId)
-                       .Where(t => t.Subject.IsSubjectQuit == false || t.SubmitState >= SubmitStateEnum.ToSubmit)
-
                        .Where(t => t.Subject.FinalSubjectVisitId != null ? t.VisitNum <= t.Subject.FinalSubjectVisit.VisitNum : true)
                        .WhereIf(inQuery.TrialSiteId != null, t => t.TrialSiteId == inQuery.TrialSiteId)
                        .WhereIf(inQuery.SubjectId != null, t => t.Subject.Id == inQuery.SubjectId)
@@ -813,9 +811,6 @@ namespace IRaCIS.Core.Application.Service.Common
         {
             var svExpression = QCCommon.GetSubjectVisitFilter(inQuery.VisitPlanArray);
             var query = _subjectVisitRepository.Where(x => x.TrialId == inQuery.TrialId)
-
-                         .Where(t => t.Subject.IsSubjectQuit == false || t.AuditState > AuditStateEnum.ToAudit)
-
                          .WhereIf(inQuery.VisitId != null, t => t.Id == inQuery.VisitId)
                         .WhereIf(inQuery.CurrentActionUserId != null, t => t.CurrentActionUserId == inQuery.CurrentActionUserId)
                         .WhereIf(inQuery.ChallengeState != null, t => t.ChallengeState == inQuery.ChallengeState)
@@ -1226,9 +1221,6 @@ namespace IRaCIS.Core.Application.Service.Common
             var svExpression = QCCommon.GetDicomStudySubjectVisitFilter(studyQuery.VisitPlanArray);
 
             var dicomStudyQuery = _dicomStudyRepository.Where(t => t.TrialId == studyQuery.TrialId)
-
-                                       .Where(t => t.Subject.IsSubjectQuit == false || t.SubjectVisit.CheckState >= CheckStateEnum.CVIng)
-
                     .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CRA, t => t.Subject.TrialSite.CRCUserList.Any(t => t.UserId == _userInfo.UserRoleId))
                     .WhereIf(studyQuery.VisitPlanArray != null && studyQuery.VisitPlanArray?.Length > 0, svExpression)
                     .WhereIf(!string.IsNullOrWhiteSpace(studyQuery.SubjectInfo), t => t.Subject.Code.Contains(studyQuery.SubjectInfo))
@@ -1257,9 +1249,6 @@ namespace IRaCIS.Core.Application.Service.Common
 
 
             var nodeDicomStudyQuery = _noneDicomStudyRepository.Where(t => t.TrialId == studyQuery.TrialId)
-
-                 .Where(t => t.Subject.IsSubjectQuit == false || t.SubjectVisit.CheckState >= CheckStateEnum.CVIng)
-
                 .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CRA, t => t.Subject.TrialSite.CRCUserList.Any(t => t.UserId == _userInfo.UserRoleId))
                  .WhereIf(studyQuery.VisitPlanArray != null && studyQuery.VisitPlanArray?.Length > 0, svExpression2)
                  .WhereIf(!string.IsNullOrWhiteSpace(studyQuery.SubjectInfo), t => t.Subject.Code.Contains(studyQuery.SubjectInfo))
@@ -1323,9 +1312,6 @@ namespace IRaCIS.Core.Application.Service.Common
             var svExpression = QCCommon.GetSubjectVisitFilter(inQuery.VisitPlanArray);
 
             var query = _subjectVisitRepository.Where(x => x.TrialId == inQuery.TrialId)
-
-                .Where(t => t.Subject.IsSubjectQuit == false || t.CheckState >= CheckStateEnum.CVIng)
-
                         .Where(x => x.AuditState == AuditStateEnum.QCPassed) //一致性核查中的，或者还没一致性核查的                                                                                                                 
                         .WhereIf(inQuery.CheckState != null, t => t.CheckState == inQuery.CheckState)
                         .WhereIf(inQuery.TrialSiteId != null, t => t.TrialSiteId == inQuery.TrialSiteId)
@@ -1366,8 +1352,6 @@ namespace IRaCIS.Core.Application.Service.Common
             var list = await _visitTaskRepository.Where(t => t.TrialId == inQuery.TrialId && t.IsAnalysisCreate == false)
                            //.Where(t => t.IsAnalysisCreate == false && t.DoctorUserId != null)
 
-                .Where(t => t.Subject.IsSubjectQuit == false || t.ReadingTaskState >= ReadingTaskState.Reading)
-
                            .WhereIf(inQuery.IsEffect == true, t => t.TaskState == TaskState.Effect || t.TaskState == TaskState.Freeze)
              .WhereIf(inQuery.IsEffect == false, t => t.TaskState == TaskState.Adbandon || t.TaskState == TaskState.HaveReturned)