From 6ca4ff736ae7b2b5aa1c1dfdb61e97bea8347ce8 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 29 Mar 2023 14:33:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BD=B1=E5=93=8D=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.API/Startup.cs | 4 --- .../IRaCIS.Core.Application.xml | 2 +- .../Service/Allocation/VisitTaskService.cs | 29 ++++++++++--------- 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/IRaCIS.Core.API/Startup.cs b/IRaCIS.Core.API/Startup.cs index 7bf6254c8..872135d04 100644 --- a/IRaCIS.Core.API/Startup.cs +++ b/IRaCIS.Core.API/Startup.cs @@ -229,12 +229,8 @@ namespace IRaCIS.Core.API ////文件伺服 必须带Token 访问 ////app.UseIRacisHostStaticFileStore(env); - - app.UseEndpoints(endpoints => { - - endpoints.MapControllers(); endpoints.MapHub("/UploadHub"); diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index eb7e4d7be..831dafb62 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -443,7 +443,7 @@ - 濡傛灉鏄熀绾块鍥 褰卞搷闄勫姞璇勪及鏍囧噯 鏄惁鍙備笌璇勪及 + 鍩虹嚎閫鍥 褰卞搷闄勫姞璇勪及鏍囧噯 鏄惁鍙備笌璇勪及 diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs index 774543869..715291490 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs @@ -2372,7 +2372,7 @@ namespace IRaCIS.Core.Application.Service.Allocation /// - /// 濡傛灉鏄熀绾块鍥 褰卞搷闄勫姞璇勪及鏍囧噯 鏄惁鍙備笌璇勪及 + /// 鍩虹嚎閫鍥 褰卞搷闄勫姞璇勪及鏍囧噯 鏄惁鍙備笌璇勪及 /// /// private async Task InfluenceAddtioncalEvaluationCritrionAsync(VisitTask task, List otherVisitIdList, bool isImageBack = true) @@ -2383,7 +2383,7 @@ namespace IRaCIS.Core.Application.Service.Allocation if (criterion.CriterionType == CriterionType.RECIST1Point1) { //褰卞儚鍥為浜唡| IR 鐢宠鍙婂熀绾块噸闃 - if (_subjectVisitRepository.Any(t => t.Id == task.SourceSubjectVisitId && t.IsBaseLine) || isImageBack) + if (_subjectVisitRepository.Any(t => t.Id == task.SourceSubjectVisitId && t.IsBaseLine) ) { await _subjectCriteriaEvaluationRepository.UpdatePartialFromQueryAsync(t => t.TrialReadingCriterion.IsAutoCreate == false && t.SubjectId == task.SubjectId, u => new SubjectCriteriaEvaluation() { @@ -2513,7 +2513,7 @@ namespace IRaCIS.Core.Application.Service.Allocation //var trialConfig = (await _trialRepository.Where(t => t.Id == trialId).Select(t => new { TrialId = t.Id, t.IsReadingTaskViewInOrder, t.ReadingType }).FirstOrDefaultAsync()).IfNullThrowException(); - var criterionConfig = (await _trialReadingCriterionRepository.Where(x => x.Id == filterObj.TrialReadingCriterionId).Select(x => new { x.ReadingTool,x.CriterionType, x.IsReadingTaskViewInOrder }).FirstOrDefaultAsync()).IfNullThrowException(); + var criterionConfig = (await _trialReadingCriterionRepository.Where(x => x.Id == filterObj.TrialReadingCriterionId).Select(x => new { x.ReadingTool,x.CriterionType,x.IsAdditionalAssessment, x.IsReadingTaskViewInOrder }).FirstOrDefaultAsync()).IfNullThrowException(); Expression> filterExpression = t => t.TrialId == trialId && t.SubjectId == filterObj.SubjectId && (t.TaskState == TaskState.Effect || t.TaskState == TaskState.Freeze) && t.TaskAllocationState == TaskAllocationState.Allocated; @@ -2532,25 +2532,26 @@ namespace IRaCIS.Core.Application.Service.Allocation if ((_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager && applyId != null && await _visitTaskReReadingRepository.AnyAsync(t => t.Id == applyId && t.CreateUser.UserTypeEnum == UserTypeEnum.IndependentReviewer)) || (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer && applyId == null)) { - - if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer) - { - filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == filterObj.TrialReadingCriterionId); - - } - else - { - if (criterionConfig.CriterionType == CriterionType.RECIST1Point1) + + //闄勫姞璇勪及 IR 鍜孭M 鐪嬪埌鐨勫奖鍝嶅垪琛ㄤ笉涓鏍 + if (criterionConfig.CriterionType == CriterionType.RECIST1Point1 && criterionConfig.IsAdditionalAssessment) { - filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == filterObj.TrialReadingCriterionId || t.TrialReadingCriterion.CriterionType == CriterionType.RECIST1Pointt1_MB); + if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager) + { + filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == filterObj.TrialReadingCriterionId || t.TrialReadingCriterion.CriterionType == CriterionType.RECIST1Pointt1_MB); + } + else + { + filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == filterObj.TrialReadingCriterionId); + } } else { + //榛樿褰卞搷鐨勯兘鏄鏍囧噯鐨勪换鍔 filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == filterObj.TrialReadingCriterionId); } - } //褰撳墠浠诲姟鍙婂叾涔嬪悗鐨勬墍鏈夎瑙嗕换鍔°佸叏灞浠诲姟銆佽鍒や换鍔°佽偪鐦ゅ闃呯墖浠诲姟