From d9262b1623e84cebe263c113be671d4d8fb0f8cb Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 15 Feb 2023 17:00:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A8=E5=B1=80PD=20?= =?UTF-8?q?=E5=8F=91=E9=80=81=E9=82=AE=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IRaCIS.Core.Application.xml | 2 +- .../Document/TrialEmailNoticeConfigService.cs | 53 ++++++++++++------- 2 files changed, 35 insertions(+), 20 deletions(-) diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 285f89791..cd061cf58 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -435,7 +435,7 @@ 系统模板文档配置表 - + 影像上传列表 只导出已上传状态的访视记录 diff --git a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs index 6292dae07..ede4c0569 100644 --- a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs +++ b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs @@ -15,6 +15,8 @@ using IRaCIS.Application.Contracts; using IRaCIS.Core.Infra.EFCore.Common; using IRaCIS.Core.Application.Contracts; using IRaCIS.Core.Application.Filter; +using MiniSoftware; +using IRaCIS.Core.Application.Service.Reading.Dto; namespace IRaCIS.Core.Application.Service { @@ -70,14 +72,15 @@ namespace IRaCIS.Core.Application.Service public async Task SetTrialEmail(SetTrialEmailInDto inDto) { - await TestEmailConfigAsync(new TrialEmailNoticeConfigAddOrEdit() { - - AuthorizationCode=inDto.EmailAuthorizationCode, - FromEmail=inDto.EmailFromEmail, - FileName=inDto.EmailFromName, - SMTPServerAddress=inDto.EmailSMTPServerAddress, - SMTPServerPort= inDto.EmailSMTPServerPort.Value, - TrialId=inDto.TrialId, + await TestEmailConfigAsync(new TrialEmailNoticeConfigAddOrEdit() + { + + AuthorizationCode = inDto.EmailAuthorizationCode, + FromEmail = inDto.EmailFromEmail, + FileName = inDto.EmailFromName, + SMTPServerAddress = inDto.EmailSMTPServerAddress, + SMTPServerPort = inDto.EmailSMTPServerPort.Value, + TrialId = inDto.TrialId, }); await _trialRepository.UpdatePartialFromQueryAsync(inDto.TrialId, x => new Trial() @@ -126,11 +129,11 @@ namespace IRaCIS.Core.Application.Service if (trialDocCount == 0) { //找到确认的标准 - var list= await _repository.Where(t => t.TrialId == trialId && t.IsConfirm).Select(t => new { t.CriterionType, TrialReadingCriterionId = t.Id }).ToListAsync(); + var list = await _repository.Where(t => t.TrialId == trialId && t.IsConfirm).Select(t => new { t.CriterionType, TrialReadingCriterionId = t.Id }).ToListAsync(); - var confirmedCriterionTypeList = list.Select(t => (CriterionType?) t.CriterionType).ToList(); + var confirmedCriterionTypeList = list.Select(t => (CriterionType?)t.CriterionType).ToList(); - var docmentList = _repository.Where(t => confirmedCriterionTypeList.Contains(t.CriterionTypeEnum) ).Select(t => new { t.Path, t.Name, t.Code, t.BusinessScenarioEnum ,t.CriterionTypeEnum}).ToList(); + var docmentList = _repository.Where(t => confirmedCriterionTypeList.Contains(t.CriterionTypeEnum)).Select(t => new { t.Path, t.Name, t.Code, t.BusinessScenarioEnum, t.CriterionTypeEnum }).ToList(); foreach (var item in docmentList) @@ -138,7 +141,7 @@ namespace IRaCIS.Core.Application.Service await _trialEmailNoticeConfigRepository.AddAsync(new TrialEmailNoticeConfig() { TrialId = trialId, - TrialReadingCriterionId= list.Where(t=>t.CriterionType==item.CriterionTypeEnum).FirstOrDefault()?.TrialReadingCriterionId, + TrialReadingCriterionId = list.Where(t => t.CriterionType == item.CriterionTypeEnum).FirstOrDefault()?.TrialReadingCriterionId, FileName = item.Name, FilePath = item.Path, BusinessScenarioEnum = item.BusinessScenarioEnum, @@ -352,7 +355,6 @@ namespace IRaCIS.Core.Application.Service #endregion - var answer = "否"; var isNeedSend = true; @@ -710,9 +712,21 @@ namespace IRaCIS.Core.Application.Service } else if (readingCategory == ReadingCategory.Global) { - var questionAnsewer = await _repository.Where(t => t.TaskId == visitTaskId && t.TrialReadingQuestion.QuestionType == QuestionType.Tumor).FirstNotNullAsync(); + var questionAnsewerList = await _repository.Where(t => t.GlobalTaskId == visitTaskId && t.TrialReadingQuestion.QuestionType == QuestionType.Tumor).ToListAsync(); + + var answerEmptyTaskIdList=questionAnsewerList.Where(t=>string.IsNullOrEmpty(t.Answer)).Select(t=>t.TaskId).ToList(); + + var answerList= await _repository.Where(t => answerEmptyTaskIdList.Contains(t.VisitTaskId) && t.ReadingQuestionTrial.QuestionType == QuestionType.Tumor) + .Select(t=>t.Answer).ToListAsync(); + + if (questionAnsewerList.Any(t => t.Answer == ((int)OverallAssessment.PD).ToString()) || answerList.Any(t => t == ((int)OverallAssessment.PD).ToString())) + { + answer = ((int)OverallAssessment.PD).ToString(); + + } + + - answer = questionAnsewer.Answer; } else if (readingCategory == ReadingCategory.Judge) { @@ -720,6 +734,7 @@ namespace IRaCIS.Core.Application.Service var questionAnsewer = await _repository.Where(t => t.VisitTaskId == visitTaskId && t.ReadingQuestionTrial.QuestionType == QuestionType.Tumor).FirstNotNullAsync(); + answer = questionAnsewer.Answer; } else @@ -731,10 +746,10 @@ namespace IRaCIS.Core.Application.Service { return "是"; } - if (answer == OverallAssessment.NA.GetEnumInt()) - { - return "NA"; - } + //if (answer == OverallAssessment.NA.GetEnumInt()) + //{ + // return "NA"; + //} else { return "否"; From 9c632648dc30fa1f50bbbd8c284bad9b7f965ed4 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 15 Feb 2023 17:02:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=8B=E5=80=BC?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Document/TrialEmailNoticeConfigService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs index 8a308f193..5d5f5843a 100644 --- a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs +++ b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs @@ -57,7 +57,7 @@ namespace IRaCIS.Core.Application.Service EmailAuthorizationCode = x.EmailAuthorizationCode, EmailSMTPServerAddress = x.EmailSMTPServerAddress, EmailFromEmail = x.EmailFromEmail, - EmailFromName = x.EmailFromEmail, + EmailFromName = x.EmailFromName, IsConfigureEmail = x.IsConfigureEmail, EmailSMTPServerPort = x.EmailSMTPServerPort From 92656b691d6175c1df78acf5b9e714a003c85ac1 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 15 Feb 2023 17:19:51 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E8=87=B4?= =?UTF-8?q?=E6=80=A7=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/Common/ExcelExportService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs index 6382d5498..6732e9548 100644 --- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs +++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs @@ -526,7 +526,7 @@ namespace IRaCIS.Core.Application.Service.Common item.AgainEvaluateResult = selfAnalysisTask?.EvaluateResult ?? String.Empty; //将自身一致性分析的字段 赋值到访视任务这个字段 - item.IsAnalysisDiffToOriginalData = selfAnalysisTask.IsAnalysisDiffToOriginalData; + item.IsAnalysisDiffToOriginalData = selfAnalysisTask?.IsAnalysisDiffToOriginalData; }