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

@@ -207,9 +207,8 @@ namespace IRaCIS.Core.Application
                 }).Where(x => x.ToBeRepliedCount > 0); 
 
 
-            var defalutSortArray = new string[] { nameof(CheckToBeDoneDto.UrgentCount) + " desc", nameof(CheckToBeDoneDto.ToBeCheckedCount) + " desc" };
 
-            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc, string.IsNullOrWhiteSpace(inQuery.SortField), defalutSortArray);
+            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(CheckToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
 
             var totalToBeCheckedCount = await _subjectVisitRepository.Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
                 .Where(u => u.CheckState == CheckStateEnum.ToCheck).CountAsync();
@@ -251,9 +250,7 @@ namespace IRaCIS.Core.Application
                  }).Where(x => x.ToBeApprovalCount > 0);
 
 
-            var defalutSortArray = new string[] { nameof(ReReadingApplyToBeDoneDto.UrgentCount) + " desc", nameof(ReReadingApplyToBeDoneDto.ToBeApprovalCount) + " desc" };
+            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ReReadingApplyToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
-
-            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc, string.IsNullOrWhiteSpace(inQuery.SortField), defalutSortArray);
 
 
             var toBeApprovalCount = _visitTaskReReadingRepository
@@ -265,38 +262,6 @@ namespace IRaCIS.Core.Application
         }
 
 
-        /// <summary>
-        ///PM  阅片人筛选   -- PM  APM 待办
-        /// </summary>
-        /// <param name="inQuery"></param>
-        /// <param name="_enrollRepository"></param>
-        /// <param name="_trialRepository"></param>
-        /// <returns></returns>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              vvv
-        [HttpPost]
-        public async Task<IResponseOutput<PageOutput<ReviewerSelectToBeDoneDto>>> GetPM_ReviewerSelectToBeDoneList(ReviewerSelectToBeDoneQuery inQuery
-            , [FromServices] IRepository<Enroll> _enrollRepository,
-             [FromServices] IRepository<Trial> _trialRepository)
-        {
-            var query = _trialRepository
-                .Where(t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id))
-                    .Select(t => new ReviewerSelectToBeDoneDto()
-                    {
-                        TrialId = t.Id,
-                        ResearchProgramNo = t.ResearchProgramNo,
-                        ExperimentName = t.ExperimentName,
-                        TrialCode = t.TrialCode,
-
-                        IsUrgent = t.IsUrgent || t.IsSubjectExpeditedView,
-                        ToBeApprovalCount = t.EnrollList.Where(u => u.EnrollStatus == EnrollStatus.InviteIntoGroup).Count()
-                    }).Where(x => x.ToBeApprovalCount > 0);
-
-            var defalutSortArray = new string[] { nameof(ReviewerSelectToBeDoneDto.IsUrgent) + " desc", nameof(ReReadingApplyToBeDoneDto.ToBeApprovalCount) + " desc" };
-
-            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc, string.IsNullOrWhiteSpace(inQuery.SortField), defalutSortArray);
-
-
-            var toBeApprovalCount = await _enrollRepository.Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
-                .Where(u => u.EnrollStatus == EnrollStatus.HasCommittedToCRO).CountAsync();
 
         /// <summary>
         /// 获取PM核对临床数据
@@ -320,11 +285,7 @@ namespace IRaCIS.Core.Application
                     ToBeApprovalCount = t.ReadModuleList.Where(u => u.IsCRCConfirm&&!u.IsPMConfirm).Count()
                 }).Where(x => x.ToBeApprovalCount > 0);
 
-
+            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ReviewerSelectToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
-            var defalutSortArray = new string[] { nameof(GetPMClinicalDataToBeDoneListOutDto.ToBeApprovalCount) + " desc" };
-
-            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc, string.IsNullOrWhiteSpace(inQuery.SortField), defalutSortArray);
-
        
 
             var all =await _trialRepository
@@ -344,43 +305,6 @@ namespace IRaCIS.Core.Application
 
         #region SPM  CPM 待办
 
-        /// <summary>
-        ///SPM  阅片人筛选 
-        /// </summary>
-        /// <param name="inQuery"></param>
-        /// <param name="_enrollRepository"></param>
-        /// <param name="_trialRepository"></param>
-        /// <returns></returns>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              vvv
-        [HttpPost]
-        public async Task<IResponseOutput<PageOutput<ReviewerSelectToBeDoneDto>>> GetSPM_ReviewerSelectToBeDoneList(ReviewerSelectToBeDoneQuery inQuery
-            , [FromServices] IRepository<Enroll> _enrollRepository,
-             [FromServices] IRepository<Trial> _trialRepository)
-        {
-            var query = _trialRepository
-                .Where(t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id))
-                    .Select(t => new ReviewerSelectToBeDoneDto()
-                    {
-                        TrialId = t.Id,
-                        ResearchProgramNo = t.ResearchProgramNo,
-                        ExperimentName = t.ExperimentName,
-                        TrialCode = t.TrialCode,
-
-                        IsUrgent = t.IsUrgent || t.IsSubjectExpeditedView,
-                        ToBeApprovalCount = t.EnrollList.Where(u => u.EnrollStatus == EnrollStatus.HasCommittedToCRO).Count()
-                    }).Where(x => x.ToBeApprovalCount > 0);
-
-
-            var defalutSortArray = new string[] { nameof(ReviewerSelectToBeDoneDto.IsUrgent) + " desc", nameof(ReviewerSelectToBeDoneDto.ToBeApprovalCount) + " desc" };
-
-            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc, string.IsNullOrWhiteSpace(inQuery.SortField), defalutSortArray);
-
-
-            var toBeApprovalCount = await _enrollRepository.Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
-                .Where(u => u.EnrollStatus == EnrollStatus.HasCommittedToCRO).CountAsync();
-
-            return ResponseOutput.Ok(result, new { TotalToBeApprovalCount = toBeApprovalCount }); ;
-
-        }
 
         /// <summary>
         /// SPM 重阅审批
@@ -411,10 +335,7 @@ namespace IRaCIS.Core.Application
                 }).Where(x => x.ToBeApprovalCount > 0);
 
 
-            var defalutSortArray = new string[] { nameof(ReReadingApprovalToBeDoneDto.UrgentCount) + " desc", nameof(ReReadingApprovalToBeDoneDto.ToBeApprovalCount) + " desc" };
+            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ReReadingApprovalToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
-
-            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc, string.IsNullOrWhiteSpace(inQuery.SortField), defalutSortArray);
-
 
             var toBeApprovalCount = _visitTaskReReadingRepository
                  .Where(t => t.OriginalReReadingTask.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
@@ -458,9 +379,7 @@ namespace IRaCIS.Core.Application
                     ReadModuleCount =t.ReadModuleList.Where(x=>!x.IsPMConfirm).Count(),
                 }).Where(x=>x.ToBeDealedCount > 0);
 
-            var defalutSortArray = new string[] { nameof(ImageClinicalDataToBeDoneDto.UrgentCount) + " desc", nameof(ImageClinicalDataToBeDoneDto.ReadModuleCount) + " desc" };
+            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ImageClinicalDataToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
-
-            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc, string.IsNullOrWhiteSpace(inQuery.SortField), defalutSortArray);
 
             var toBeDealedCount = _subjectVisitRepository
                  //.Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id) && t.Trial.clinicalDataTrialSets.Any(t => t.ClinicalDataLevel == ClinicalLevel.Subject && t.IsConfirm))
@@ -499,10 +418,7 @@ namespace IRaCIS.Core.Application
                     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" };
+            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ImageClinicalDataToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
-
-            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc, string.IsNullOrWhiteSpace(inQuery.SortField), defalutSortArray);
-
 
             var toBeDealedCount = _subjectVisitRepository
                  //.Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id) && t.Trial.clinicalDataTrialSets.Any(t => t.ClinicalDataLevel == ClinicalLevel.Subject && t.IsConfirm))
@@ -549,10 +465,7 @@ namespace IRaCIS.Core.Application
 
                 }).Where(x => x.ToBeDealedCount > 0); ;
 
-            var defalutSortArray = new string[] { nameof(ImageQuestionToBeDoneDto.UrgentCount) + " desc", nameof(ImageQuestionToBeDoneDto.ToBeDealedCount) + " desc" };
+            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ImageQuestionToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
-
-            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc, string.IsNullOrWhiteSpace(inQuery.SortField), defalutSortArray);
-
 
             var toBeDealedCount = _subjectVisitRepository
                   .Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
@@ -594,10 +507,9 @@ namespace IRaCIS.Core.Application
                 }).Where(x => x.ToBeReplyedCount > 0);
 
 
-            var defalutSortArray = new string[] { nameof(ImageCheckQuestionToBeDoneDto.UrgentCount) + " desc", nameof(ImageCheckQuestionToBeDoneDto.ToBeReplyedCount) + " desc" };
 
-            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc, string.IsNullOrWhiteSpace(inQuery.SortField), defalutSortArray);
 
+            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ImageCheckQuestionToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
 
             var toBeDealedCount = _subjectVisitRepository
                   .Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
@@ -640,10 +552,7 @@ namespace IRaCIS.Core.Application
 
                 }).Where(x => x.ToBeReUploadCount > 0);
 
-
+            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ImageReUploadToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
-            var defalutSortArray = new string[] { nameof(ImageReUploadToBeDoneDto.UrgentCount) + " desc", nameof(ImageReUploadToBeDoneDto.ToBeReUploadCount) + " desc" };
-
-            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc, string.IsNullOrWhiteSpace(inQuery.SortField), defalutSortArray);
 
             var toBeDealedCount = _subjectVisitRepository
                   .Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
@@ -687,12 +596,7 @@ namespace IRaCIS.Core.Application
 
                 }).Where(x => x.ToBeDealedCount > 0); ;
 
-
+            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ImageSubmittedToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
-
-            var defalutSortArray = new string[] { nameof(ImageSubmittedToBeDoneDto.UrgentCount) + " desc", nameof(ImageSubmittedToBeDoneDto.ToBeDealedCount) + " desc" };
-
-            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc, string.IsNullOrWhiteSpace(inQuery.SortField), defalutSortArray);
-
 
             var toBeDealedCount = _subjectVisitRepository
                   .Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
@@ -745,11 +649,7 @@ namespace IRaCIS.Core.Application
 
                 }).Where(x => x.ToBeClaimedCount+x.ToBeReviewedCount > 0); 
 
-
+            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ImageQualityToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
-            var defalutSortArray = new string[] { nameof(ImageQualityToBeDoneDto.UrgentCount) + " desc", nameof(ImageQualityToBeDoneDto.ToBeClaimedCount) + " desc" };
-
-            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc, string.IsNullOrWhiteSpace(inQuery.SortField), defalutSortArray);
-
 
 
             var toBeClaimedCount = _subjectVisitRepository
@@ -794,10 +694,7 @@ namespace IRaCIS.Core.Application
 
                 }).Where(x => x.ToBeDealedCount > 0); ;
 
-            var defalutSortArray = new string[] { nameof(ImageQuestionToBeDoneDto.UrgentCount) + " desc", nameof(ImageQuestionToBeDoneDto.ToBeDealedCount) + " desc" };
+            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ImageQuestionToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
-
-            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc, string.IsNullOrWhiteSpace(inQuery.SortField), defalutSortArray);
-
 
             var toBeDealedCount = _subjectVisitRepository
                   .Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
@@ -938,9 +835,8 @@ namespace IRaCIS.Core.Application
             #endregion
 
 
-            var defalutSortArray = new string[] { nameof(IRImageReadingToBeDoneDto.UrgentCount) + " desc", nameof(IRImageReadingToBeDoneDto.UnReadCount) + " desc" };
 
-            var result = await newQuery.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc, string.IsNullOrWhiteSpace(inQuery.SortField), defalutSortArray);
+            var result = await newQuery.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(IRImageReadingToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
 
             var toBeDealedCount = _trialRepository
                    .Where(t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id))
@@ -1003,14 +899,9 @@ namespace IRaCIS.Core.Application
                     //ToBeReplyedCount = g.Where(u =>
                     // u.ReadingMedicalReviewDialogList.OrderByDescending(l => l.CreateTime).First().UserTypeEnumInt == (int)UserTypeEnum.MIM).Count(),
 
-                }).Where(t => t.ToBeReplyedCount > 0);
+                });
-
-
-            var defalutSortArray = new string[] { nameof(MedicalCommentsToBeDoneDto.UrgentCount) + " desc", nameof(MedicalCommentsToBeDoneDto.ToBeReplyedCount) + " desc" };
-
-            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc, string.IsNullOrWhiteSpace(inQuery.SortField), defalutSortArray);
-
 
+            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(MedicalCommentsToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
 
             var toBeDealedCount = _taskMedicalReviewRepository
                 .Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
@@ -1074,16 +965,13 @@ namespace IRaCIS.Core.Application
 
                        ToBeReviewedCount = g.Where(u => !u.IsInvalid && u.AuditState != MedicalReviewAuditState.HaveSigned).Count()
 
-                   }).Where(t => t.ToBeReplyedCount > 0);
+                   });
 
             #endregion
 
 
-            var defalutSortArray = new string[] { nameof(MedicalCommentsToBeDoneDto.UrgentCount) + " desc", nameof(MedicalCommentsToBeDoneDto.ToBeReplyedCount) + " desc" };
-
-            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc, string.IsNullOrWhiteSpace(inQuery.SortField), defalutSortArray);
-
 
+            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(MedicalCommentsToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
 
             var toBeReplyedQuery = _taskMedicalReviewRepository
                   .Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))

IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs

@@ -1130,10 +1130,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 await InsertInspection<ReadingMedicineTrialQuestion>(entity, type, x => new InspectionConvertDTO()
                 {
                     IsDistinctionInterface = false,
-
+                    ObjectRelationParentId = x.TrialId
-                    ObjectRelationParentId = entity.TrialId,
-                    TrialReadingCriterionId = x.TrialReadingCriterionId,
-
 
                 }, new { ParentQuestionName = parentQuestionName });
             }
@@ -1411,30 +1408,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                 });
             }
-            foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialSiteUserSurvey)))
-            {
-                var type = GetEntityAuditOpt(item);
-
-                var entity = item.Entity as TrialSiteUserSurvey;
-
-                await InsertInspection<TrialSiteUserSurvey>(entity, type, x => new InspectionConvertDTO()
-                {
-                    IsDistinctionInterface = false
-
-                });
-            }
-            foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialSiteEquipmentSurvey)))
-            {
-                var type = GetEntityAuditOpt(item);
-
-                var entity = item.Entity as TrialSiteEquipmentSurvey;
-
-                await InsertInspection<TrialSiteEquipmentSurvey>(entity, type, x => new InspectionConvertDTO()
-                {
-                    IsDistinctionInterface = false
-
-                });
-            }
 
             #endregion
 
@@ -1736,8 +1709,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                     SubjectVisitId = x.Id,
                     SiteId = x.SiteId,
 
-                    ExtraIndentification = extraIdentification,
-
                 },
                 //兼容之前的配置名 
                 new { SubjectVisitName = entity.VisitName }
@@ -2135,12 +2106,12 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                         if (entity.RequestReReadingResultEnum == RequestReReadingResult.Agree)
                         {
-                            extraIdentification = extraIdentification+"/" + 1;
+                            extraIdentification = "/" + 1;
 
                         }
                         else if (entity.RequestReReadingResultEnum == RequestReReadingResult.Reject)
                         {
-                            extraIdentification = extraIdentification+ "/" + 2;
+                            extraIdentification = "/" + 2;
                         }
                         break;
                 }