From 9523efac7b9fa2b15a7415a26331495474ff0530 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Wed, 19 Oct 2022 17:22:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Reading/ReadingImageTask/ReadingGlobalTaskService.cs | 2 +- .../Reading/ReadingImageTask/ReadingJudgeTaskService.cs | 4 ++-- .../Reading/ReadingImageTask/ReadingOncologyTaskService.cs | 7 +++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs index d6a46a0d3..7f69ccdb0 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs @@ -203,7 +203,7 @@ namespace IRaCIS.Application.Services List assessTypeList = await _readingCriterionDictionaryRepository.Where(x => x.CriterionId == taskInfo.TrialReadingCriterionId - && x.ParentCode == "GlobalAssessType" + && x.ParentCode == ReadingCommon.GlobalAssess ) .Select(x => new GetAssessTypeOutDto() { diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs index 06e561290..4810774c5 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs @@ -200,7 +200,7 @@ namespace IRaCIS.Application.Services { Answer = item.AfterQuestionList.Where(x => x.GlobalAnswerType == GlobalAnswerType.Reason).Select(x => x.Answer).FirstOrDefault(), QuestionType = JudgeReadingQuestionType.VisitRemark, - + QuestionName = "全局阅片备注", }); judgeReadingInfo.VisitTaskInfoList.Add(judgeReadingQuestion); @@ -234,7 +234,7 @@ namespace IRaCIS.Application.Services { Answer = twoItem.AfterQuestionList.Where(x => x.GlobalAnswerType == GlobalAnswerType.Reason).Select(x => x.Answer).FirstOrDefault(), QuestionType = JudgeReadingQuestionType.VisitRemark, - + QuestionName = "全局阅片备注", }); judgeReadingInfo.VisitTaskInfoList.Add(rTwoJudge); diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs index a12b16063..68b321bdc 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs @@ -135,7 +135,7 @@ namespace IRaCIS.Application.Services result.OncologyVisits = oncologyVisits; List assessTypeList = await _readingCriterionDictionaryRepository.Where(x => x.CriterionId == taskInfo.TrialReadingCriterionId - && x.ParentCode == "OncologyAssessType" + && x.ParentCode == ReadingCommon.OncologyAssess ) .Select(x => new GetAssessTypeOutDto() { @@ -262,9 +262,12 @@ namespace IRaCIS.Application.Services ReadingCategory = ReadingCategory.Oncology, }); + var originalVisitId = await _visitTaskRepository.Where(x => x.SouceReadModuleId == globalreadModuleId && x.TaskState == TaskState.Effect && x.ReadingCategory == ReadingCategory.Global + && x.ReadingTaskState == ReadingTaskState.HaveSigned && !x.IsAnalysisCreate && x.TrialReadingCriterionId == readModuleInfo.TrialReadingCriterionId + ).Select(x => x.Id).FirstOrDefaultAsync(); await _visitTaskHelpeService.AddTaskAsync(new GenerateTaskCommand() { - + OriginalVisitId= originalVisitId, ReadingCategory = GenerateTaskCategory.Oncology, TrialId = readModuleInfo.TrialId, ReadingGenerataTaskList = needReadList