From 5346a126415ebfa269ead57345ce593fe0e9b158 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 30 Nov 2023 16:34:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AD=A6=E5=91=8A=E4=BF=AE=E6=94=B92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Helper/FileStoreHelper.cs | 3 +-- .../Service/Allocation/VisitTaskService.cs | 6 +++--- .../Service/Common/ExcelExportService.cs | 1 - .../Service/Inspection/FrontAuditConfigService.cs | 2 +- .../Reading/ReadingCriterion/ReadingQuestionService.cs | 1 - .../ReadingCalculate/General/ReadingCalculateService.cs | 1 - 6 files changed, 5 insertions(+), 9 deletions(-) diff --git a/IRaCIS.Core.Application/Helper/FileStoreHelper.cs b/IRaCIS.Core.Application/Helper/FileStoreHelper.cs index c0797b1fe..f85450387 100644 --- a/IRaCIS.Core.Application/Helper/FileStoreHelper.cs +++ b/IRaCIS.Core.Application/Helper/FileStoreHelper.cs @@ -27,7 +27,7 @@ public static class FileStoreHelper // 填写Object完整路径，完整路径中不能包含Bucket名称，例如exampledir/exampleobject.txt。 var fileNameList = filePath.Split(',').ToList(); - var fileName = fileNameList[fileNameList.Count() - 1]; + var fileName = fileNameList[fileNameList.Count - 1]; var objectName = route+ fileName; // 填写本地文件完整路径，例如D:\\localpath\\examplefile.txt。如果未指定本地路径，则默认从示例程序所属项目对应本地路径中上传文件。 @@ -462,7 +462,6 @@ public static class FileStoreHelper /// /// /// - /// /// public static (string PhysicalPath, string RelativePath, string FileRealName) GetUploadPrintscreenFilePath(IWebHostEnvironment _hostEnvironment, string fileName, Guid trialId, Guid siteid, Guid subjectId) { diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs index 1deea717e..59c72910a 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs @@ -577,8 +577,8 @@ namespace IRaCIS.Core.Application.Service.Allocation var taskList = _visitTaskRepository.Where(t => t.TrialId == assignConfirmCommand.TrialId && t.DoctorUserId == null, true) - .WhereIf(subjectIdList.Count() > 0 && assignConfirmCommand.IsJudgeDoctor == false, t => subjectIdList.Contains(t.SubjectId) && t.Subject.SubjectDoctorList.Where(t => t.ArmEnum != Arm.JudgeArm).Any()) - .WhereIf(subjectIdList.Count() > 0 && assignConfirmCommand.IsJudgeDoctor, t => subjectIdList.Contains(t.SubjectId) && t.Subject.SubjectDoctorList.Where(t => t.ArmEnum == Arm.JudgeArm).Any()) + .WhereIf(subjectIdList.Count > 0 && assignConfirmCommand.IsJudgeDoctor == false, t => subjectIdList.Contains(t.SubjectId) && t.Subject.SubjectDoctorList.Where(t => t.ArmEnum != Arm.JudgeArm).Any()) + .WhereIf(subjectIdList.Count > 0 && assignConfirmCommand.IsJudgeDoctor, t => subjectIdList.Contains(t.SubjectId) && t.Subject.SubjectDoctorList.Where(t => t.ArmEnum == Arm.JudgeArm).Any()) //过滤掉 那些回退的subject .Where(t => !t.Subject.SubjectVisitList.Any(t => t.IsPMBackOrReReading)) @@ -1234,7 +1234,7 @@ namespace IRaCIS.Core.Application.Service.Allocation var requestRecordList = await _visitTaskReReadingRepository.Where(t => baseLineTaskIdList.Contains(t.OriginalReReadingTaskId) && t.RequestReReadingUserId == _userInfo.Id && t.RequestReReadingReason == "AIR自动重阅基线").ToListAsync(); - if (requestRecordList.Count() != baseLineTaskIdList.Count()) + if (requestRecordList.Count != baseLineTaskIdList.Count) { //---后台数据有错误 return ResponseOutput.NotOk(_localizer["VisitTask_DoctorConfiguration"]); diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs index a40c0b71a..08bacbced 100644 --- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs +++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs @@ -971,7 +971,6 @@ namespace IRaCIS.Core.Application.Service.Common /// /// /// - /// /// [HttpPost] public async Task GetGroupAnalysisTaskList_Export(VisitTaskQuery queryVisitTask, diff --git a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs index 559fff3a5..3498ae57b 100644 --- a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs +++ b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs @@ -366,7 +366,7 @@ namespace IRaCIS.Core.Application.Service resultJsonStrList.Add(auditData?.JsonStr); }); - if (resultJsonStrList.Count() < 2) + if (resultJsonStrList.Count < 2) { resultJsonStrList.Add(String.Empty); } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs index 7fa9c7ec0..b0179e1c7 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs @@ -372,7 +372,6 @@ namespace IRaCIS.Application.Services /// /// 新增修改系统表格问题 /// - /// /// [HttpPost] public async Task AddOrUpdateReadingTableQuestionSystem(ReadingTableQuestionSystemAddOrEdit indto) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs index 49509412d..dc7a2cb71 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs @@ -182,7 +182,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate /// /// 获取阅片报告 /// - /// /// public async Task GetReadingReportEvaluation(GetReadingReportEvaluationInDto inDto) {