增加一致性核查排序 以及一致性核查国际化调整填充公司简称

IRaCIS.Core.Application/Service/QC/QCListService.cs

@@ -1,6 +1,7 @@
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Contracts.DTO;
 using IRaCIS.Core.Application.Service.Reading.Dto;
+using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infrastructure;
 using MassTransit.Initializers;
@@ -279,7 +280,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// <param name="inQuery"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<(PageOutput<QCCheckWithModalityView>, TrialSubjectAndSVConfig)> GetConsistencyVerificationList(CheckQuery inQuery)
+        public async Task<IResponseOutput<PageOutput<QCCheckWithModalityView>>> GetConsistencyVerificationList(CheckQuery inQuery)
         {
 
             var svExpression = QCCommon.GetSubjectVisitFilter(inQuery.VisitPlanArray);
@@ -294,9 +295,14 @@ namespace IRaCIS.Core.Application.Image.QA
                         .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CRA, t => t.TrialSite.CRCUserList.Any(t => t.UserId == _userInfo.UserRoleId))//CRC 过滤负责的site
                         .ProjectTo<QCCheckWithModalityView>(_mapper.ConfigurationProvider);
 
-            var pageList = await query.ToPagedListAsync(inQuery);
+
+            var defalutSortArray = new string[] { nameof(QCCheckWithModalityView.CheckState), nameof(QCCheckWithModalityView.IsUrgent), nameof(QCCheckWithModalityView.SubjectCode), nameof(QCCheckWithModalityView.VisitNum) };
+
+            var pageList = await query.ToPagedListAsync(inQuery, defalutSortArray);
+
             var config = await _trialRepository.Where(t => t.Id == inQuery.TrialId).ProjectTo<TrialSubjectAndSVConfig>(_mapper.ConfigurationProvider).FirstOrDefaultAsync().IfNullThrowException();
-            return (pageList, config);
+
+            return ResponseOutput.Ok(pageList, config);
         }
 
         /// <summary>
@@ -530,7 +536,7 @@ namespace IRaCIS.Core.Application.Image.QA
 
             config.IsPacsConnectConfiged = await _subjectVisitRepository.Where(t => t.Id == subjectVisitId).AnyAsync(t => t.Trial.IsPACSConnect && t.Subject.TrialSite.TrialSiteDicomAEList.Any());
 
-            return ResponseOutput.Ok (list, config);
+            return ResponseOutput.Ok(list, config);
         }