diff --git a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs index ed3b19658..46bae4d87 100644 --- a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs +++ b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs @@ -622,8 +622,8 @@ namespace IRaCIS.Core.Application.Service var value = new Dictionary() { - ["Criterion_Enroll_Replace"]= enrollReplace, - ["Criterion_PD_Replace"]= PdReplace, + ["Criterion_Enroll_Replace"] = enrollReplace, + ["Criterion_PD_Replace"] = PdReplace, ["SponsorName"] = taskInfo.SponsorName, ["ResearchProgramNo"] = taskInfo.ResearchProgramNo, ["TrialSiteCode"] = taskInfo.TrialSiteCode, @@ -1090,7 +1090,7 @@ namespace IRaCIS.Core.Application.Service var list = await _readingTableQuestionAnswerRepository.Where(x => x.VisitTaskId == visitTaskId && x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.LesionNumber && x.ReadingQuestionTrial.LesionType == LesionType.BaselineLesions).Select(t => t.Answer).ToListAsync(); - bool exists = list.Any(s => int.TryParse(s, out var n) && n > 100); + bool exists = list.Any(s => int.TryParse(s, out var n) && n >= 1); if (exists) { enrollAnswer = _userInfo.IsEn_Us ? "Yes" : "是"; @@ -1348,7 +1348,7 @@ x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.LesionNumber && x.Readi if (answer == OverallAssessment.PD.GetEnumInt()) { answer = _userInfo.IsEn_Us ? "Yes" : "是"; - } + } else { answer = _userInfo.IsEn_Us ? "No" : "否"; diff --git a/IRaCIS.Core.Application/Triggers/SubjectVisitScanDateTrigger.cs b/IRaCIS.Core.Application/Triggers/SubjectVisitScanDateTrigger.cs index 977643b74..2da80e41a 100644 --- a/IRaCIS.Core.Application/Triggers/SubjectVisitScanDateTrigger.cs +++ b/IRaCIS.Core.Application/Triggers/SubjectVisitScanDateTrigger.cs @@ -25,10 +25,6 @@ namespace IRaCIS.Core.Application.Triggers { await UpdateSubjectVisitImageDateAsync(context.Entity.SubjectVisitId); - await _subjectVisitRepository.BatchUpdateNoTrackingAsync(t => t.Id == subjectVisitId, u => new SubjectVisit() - { - VisitExecuted = VisitExecutedEnum.Executed - }); await UpdateSubjectVisitSubmitStateAsync(subjectVisitId); } @@ -56,11 +52,6 @@ namespace IRaCIS.Core.Application.Triggers context.Entity.Modalities = ModaliyStr; - await _subjectVisitRepository.BatchUpdateNoTrackingAsync(t => t.Id == subjectVisitId, u => new SubjectVisit() - { - VisitExecuted = VisitExecutedEnum.Executed - }); - await UpdateSubjectVisitSubmitStateAsync(subjectVisitId); //添加检查级别临床数据 @@ -122,7 +113,7 @@ namespace IRaCIS.Core.Application.Triggers { await _subjectVisitRepository.UpdatePartialFromQueryAsync(t => t.Id == subjectVisitId && t.SubmitState == SubmitStateEnum.ToSubmit, - u => new SubjectVisit() { VisitExecuted = 0, SVENDTC = null, SVSTDTC = null, SubmitState = SubmitStateEnum.None }, true); + u => new SubjectVisit() { VisitExecuted = VisitExecutedEnum.UnExecuted, SVENDTC = null, SVSTDTC = null, SubmitState = SubmitStateEnum.None }, true); } else { @@ -131,11 +122,11 @@ namespace IRaCIS.Core.Application.Triggers } } - /// - /// 处理访视拍片日期 - /// - /// - /// + /// + /// 处理访视拍片日期 + /// + /// + /// private async Task UpdateSubjectVisitImageDateAsync(Guid subjectVisitId) { var svTime = _subjectVisitRepository.Where(t => t.Id == subjectVisitId).Select(t => new @@ -157,6 +148,23 @@ namespace IRaCIS.Core.Application.Triggers LatestScanDate = maxArray.Max() }); + + if (minArray.Min() == null && maxArray.Max() == null) + { + await _subjectVisitRepository.BatchUpdateNoTrackingAsync(t => t.Id == subjectVisitId, u => new SubjectVisit() + { + VisitExecuted = VisitExecutedEnum.UnExecuted + }); + } + else + { + + + await _subjectVisitRepository.BatchUpdateNoTrackingAsync(t => t.Id == subjectVisitId, u => new SubjectVisit() + { + VisitExecuted = VisitExecutedEnum.Executed + }); + } } } } \ No newline at end of file