修改排序bug

2024-09-14 16:27:16 +08:00
parent f7c669a7d7
commit 010fdf6e2c
6 changed files with 14 additions and 11 deletions
@@ -27,6 +27,7 @@ using System.Runtime.InteropServices;
 using SharpCompress.Common;
 using DocumentFormat.OpenXml.Bibliography;
 using System.Linq.Dynamic.Core;
+using Microsoft.Extensions.Options;

 namespace IRaCIS.Core.Application.Service
 {
@@ -50,6 +51,7 @@ namespace IRaCIS.Core.Application.Service
            IRepository<SubjectVisit> _subjectVisitRepository,
            IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository,
            IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
+            IOptionsMonitor<SystemEmailSendConfig> _systemEmailSendConfig,
            IEmailSendService _emailSendService) : BaseService, ITrialEmailNoticeConfigService
    {

@@ -135,8 +135,8 @@ namespace IRaCIS.Core.Application.Service.Inspection
                            //UserLastName = leftuser.LastName,
                            ExperimentName = leftrial.ExperimentName,

-
-                            SubjectCode = leftvisttask.BlindSubjectCode.IsNullOrEmpty()? leftsubject.Code: leftvisttask.BlindSubjectCode,
+                            //SubjectCode = leftvisttask.BlindSubjectCode.IsNullOrEmpty()? leftsubject.Code: leftvisttask.BlindSubjectCode,
+                            SubjectCode = leftvisttask.IsAnalysisCreate? leftvisttask.BlindSubjectCode: leftsubject.Code ,
                            SiteCode = lefttrialSite.TrialSiteCode,

                            ResearchProgramNo = leftrial.ResearchProgramNo,
@@ -31,8 +31,9 @@ namespace IRaCIS.Application.Services
        IRepository<VisitStage> _visitStageRepository,
        IRepository<TrialPaymentPrice> _trialPaymentPriceRepository,
        IRepository<TrialDictionary> _trialDictionaryRepository,
-         IRepository<TrialBodyPart> _trialBodyPartRepository,
-        IOptionsMonitor<ServiceVerifyConfigOption> _verifyConfig) : BaseService, ITrialService
+        IRepository<TrialBodyPart> _trialBodyPartRepository,
+        IOptionsMonitor<ServiceVerifyConfigOption> _verifyConfig
+        ) : BaseService, ITrialService
    {

       
@@ -139,8 +139,8 @@ namespace IRaCIS.Application.Services
            var query = _patientRepository.Where(t => t.TrialId == inQuery.TrialId)
             .WhereIf(!string.IsNullOrWhiteSpace(inQuery.PatientIdStr), t => t.PatientIdStr.Contains(inQuery.PatientIdStr))
             .WhereIf(!string.IsNullOrWhiteSpace(inQuery.PatientName), t => t.PatientName.Contains(inQuery.PatientName))
-              .WhereIf(!string.IsNullOrWhiteSpace(inQuery.SubejctCode), t => t.Subject.Code.Contains(inQuery.SubejctCode))
-               .WhereIf(!string.IsNullOrWhiteSpace(inQuery.TrialSiteKeyInfo), t => t.TrialSite.TrialSiteCode.Contains(inQuery.TrialSiteKeyInfo)
+             .WhereIf(!string.IsNullOrWhiteSpace(inQuery.SubejctCode), t => t.Subject.Code.Contains(inQuery.SubejctCode))
+             .WhereIf(!string.IsNullOrWhiteSpace(inQuery.TrialSiteKeyInfo), t => t.TrialSite.TrialSiteCode.Contains(inQuery.TrialSiteKeyInfo)
               || t.TrialSite.TrialSiteAliasName.Contains(inQuery.TrialSiteKeyInfo) || t.TrialSite.TrialSiteName.Contains(inQuery.TrialSiteKeyInfo))
             .WhereIf(!string.IsNullOrWhiteSpace(inQuery.CallingAE), t => t.SCPStudyList.Any(t => t.CallingAE == inQuery.CallingAE))
             .WhereIf(!string.IsNullOrWhiteSpace(inQuery.CalledAE), t => t.SCPStudyList.Any(t => t.CalledAE == inQuery.CalledAE))