IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs

@@ -523,22 +523,6 @@ namespace IRaCIS.Core.Application.Service
                 var readModule = await _readModuleRepository.Where(x => x.Id == inDto.ReadModuleId).FirstNotNullAsync();
                 inDto.TrialReadingCriterionId = readModule.TrialReadingCriterionId;
             }
-
-            // 有全局就查全局 有肿瘤学就查肿瘤学
-
-            var clinicalDataLevelList = await _clinicalDataTrialSetRepository.Where(x => x.TrialId == inDto.TrialId && x.IsConfirm && x.UploadRole == UploadRole.CRC && x.ClinicalUploadType == ClinicalUploadType.Structuring).Select(x => x.ClinicalDataLevel).Distinct().ToListAsync();
-
-            ReadingSetType? readingSetType = null;
-            if (clinicalDataLevelList.Contains(ClinicalLevel.ImageRead) && !clinicalDataLevelList.Contains(ClinicalLevel.OncologyRead))
-            {
-                readingSetType = ReadingSetType.ImageReading;
-            }
-            else if (clinicalDataLevelList.Contains(ClinicalLevel.OncologyRead) && !clinicalDataLevelList.Contains(ClinicalLevel.ImageRead))
-            {
-                readingSetType = ReadingSetType.TumorReading;
-            }
-
-
             var query = _readModuleRepository.Where(x => x.TrialId == inDto.TrialId)
                 .WhereIf(inDto.ReadModuleId != null, x => x.Id == inDto.ReadModuleId)
                 .WhereIf(inDto.IsCRCConfirm != null, x => x.IsCRCConfirm == inDto.IsCRCConfirm)
@@ -548,7 +532,6 @@ namespace IRaCIS.Core.Application.Service
 				.WhereIf(inDto.SubjectId != null, x => x.SubjectId == inDto.SubjectId)
                 .WhereIf(inDto.StartTime != null, x => x.SubjectVisit.LatestScanDate >= inDto.StartTime)
                 .WhereIf(inDto.EndTime != null, x => x.SubjectVisit.LatestScanDate <= inDto.EndTime)
-                .WhereIf(readingSetType != null, x => x.ReadingSetType== readingSetType)
                 .Select(x => new GetCRCConfirmListOutDto()
                 {
                  

IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs

@@ -395,9 +395,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public Arm ArmEnum { get; set; }
 
-        public bool IsExistsClinicalData { get; set; }
-
-
 
         public MedicalReviewAuditState AuditState { get; set; }
 

IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs

@@ -33,7 +33,6 @@ namespace IRaCIS.Core.Application.Service
         private readonly IReadingImageTaskService _iReadingImageTaskService;
         private readonly IRepository<User> _userTaskRepository;
         private readonly IVisitTaskService _visitTaskService;
-        private readonly IReadingClinicalDataService _readingClinicalDataService;
         private readonly IRepository<TaskMedicalReview> _taskMedicalReviewRepository;
         private readonly IRepository<ReadingMedicalReviewDialog> _readingMedicalReviewDialogRepository;
         private readonly IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrial;
@@ -53,7 +52,6 @@ namespace IRaCIS.Core.Application.Service
               IRepository<ReadingSystemCriterionDictionary> readingCriterionDictionaryRepository,
             IRepository<User> userTaskRepository,
             IVisitTaskService visitTaskService,
-                  IReadingClinicalDataService readingClinicalDataService,
             IRepository<TaskMedicalReview> taskMedicalReviewRepository,
             IRepository<ReadingMedicalReviewDialog> readingMedicalReviewDialogRepository,
             IRepository<ReadingQuestionCriterionTrial> readingQuestionCriterionTrial,
@@ -73,7 +71,6 @@ namespace IRaCIS.Core.Application.Service
             this._readingCriterionDictionaryRepository = readingCriterionDictionaryRepository;
             this._userTaskRepository = userTaskRepository;
             this._visitTaskService = visitTaskService;
-            this._readingClinicalDataService = readingClinicalDataService;
             this._taskMedicalReviewRepository = taskMedicalReviewRepository;
             this._readingMedicalReviewDialogRepository = readingMedicalReviewDialogRepository;
             this._readingQuestionCriterionTrial = readingQuestionCriterionTrial;
@@ -112,17 +109,6 @@ namespace IRaCIS.Core.Application.Service
          
 
             medicalReviewInfo.VisitTaskId = taskInfo.Id;
-
-            var clinicalDataList = await _readingClinicalDataService.GetClinicalDataList(new GetReadingOrTaskClinicalDataListInDto()
-            {
-
-                SubjectId = taskInfo.SubjectId,
-                TrialId = taskInfo.TrialId,
-                VisitTaskId = taskInfo.Id,
-            });
-
-            medicalReviewInfo.IsExistsClinicalData = clinicalDataList.Count > 0;
-
             medicalReviewInfo.ArmEnum = taskInfo.ArmEnum;
             medicalReviewInfo.SubjectCode = taskInfo.IsAnalysisCreate?taskInfo.BlindSubjectCode: taskInfo.Subject.Code;
             medicalReviewInfo.TaskBlindName = taskInfo.TaskBlindName;

IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs

@@ -429,7 +429,7 @@ namespace IRaCIS.Core.Application
                     ToBeDealedCount = t.ReadingClinicalDataList.Where(x => !x.IsSign && x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC && x.ClinicalDataTrialSet.ClinicalDataLevel != ClinicalLevel.SubjectVisit && x.ClinicalDataTrialSet.ClinicalDataLevel != ClinicalLevel.Subject).Count(),
                     ToBeVisitCount = t.ReadingClinicalDataList.Where(x => !x.IsSign && x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC && x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.SubjectVisit).Count(),
                     ToAllCount = t.ReadingClinicalDataList.Where(x => !x.IsSign && x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC).Count(),
-                    ReadModuleCount = t.ReadModuleList.Where(x => !x.IsCRCConfirm).Count(),
+                    ReadModuleCount = t.ReadModuleList.Where(x => !x.IsPMConfirm).Count(),
                 }).Where(x => x.ReadModuleCount > 0);
 
             var defalutSortArray = new string[] { nameof(ImageClinicalDataToBeDoneDto.UrgentCount) + " desc", nameof(ImageClinicalDataToBeDoneDto.ToBeDealedCount) + " desc" };