From e739925da2ff5cd53582961498b2148d3d1de734 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 4 Dec 2023 10:51:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=BE=8E=E5=9B=BD=E6=BC=94=E7=A4=BA?= =?UTF-8?q?=EF=BC=8CAIR=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Allocation/VisitTaskService.cs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs index e350e2c1d..ea991d9df 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs @@ -1214,6 +1214,17 @@ namespace IRaCIS.Core.Application.Service.Allocation var baseLineTaskList = await _visitTaskRepository.Where(t => t.TrialId == command.TrialId && t.TrialReadingCriterionId == command.TrialReadingCriterionId && t.DoctorUserId == _userInfo.Id && t.TaskState == TaskState.Effect && t.ReadingCategory == ReadingCategory.Visit && t.ReadingTaskState == ReadingTaskState.HaveSigned && t.SourceSubjectVisit.IsBaseLine == true).ToListAsync(); + var judegeList= await _visitTaskRepository.Where(t => t.TrialId == command.TrialId && t.TrialReadingCriterionId == command.TrialReadingCriterionId && t.DoctorUserId == _userInfo.Id + && t.TaskState == TaskState.Effect && t.ReadingCategory == ReadingCategory.Judge && t.ReadingTaskState == ReadingTaskState.HaveSigned).ToListAsync(); + + foreach (var item in judegeList) + { + if (!baseLineTaskList.Any(t => t.SubjectId == item.SubjectId)) + { + baseLineTaskList.Add(item); + } + } + var baseLineTaskIdList = baseLineTaskList.Select(t => t.Id).ToList(); From 26dbbd8dc9fff078171da7a828c1626a76916ce3 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 4 Dec 2023 11:08:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=A6=81=E7=94=A8=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E6=B2=A1=E5=BF=85=E8=A6=81=E7=9A=84=E8=AD=A6=E5=91=8A=E7=9F=AB?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .editorconfig | 42 ++++-------------------------------------- 1 file changed, 4 insertions(+), 38 deletions(-) diff --git a/.editorconfig b/.editorconfig index 64d1211b1..15b266e76 100644 --- a/.editorconfig +++ b/.editorconfig @@ -126,47 +126,13 @@ csharp_style_deconstructed_variable_declaration = true:suggestion csharp_style_unused_value_assignment_preference = discard_variable:suggestion csharp_style_unused_value_expression_statement_preference = discard_variable:silent -# SA0001: XML comment analysis disabled -dotnet_diagnostic.SA0001.severity = suggestion -# SA1002: Semicolons should be spaced correctly -dotnet_diagnostic.SA1002.severity = suggestion - -# SA1005: Single line comments should begin with single space -dotnet_diagnostic.SA1005.severity = none -dotnet_diagnostic.CS8618.severity = none -dotnet_diagnostic.CS8604.severity = none -dotnet_diagnostic.CS8600.severity = none dotnet_diagnostic.CS1570.severity = none -dotnet_diagnostic.CS8601.severity = none -dotnet_diagnostic.CS8632.severity = none -dotnet_diagnostic.CS8625.severity = none - -dotnet_diagnostic.CS8603.severity = none -dotnet_diagnostic.CS8602.severity = none -dotnet_diagnostic.CS1998.severity = none -dotnet_diagnostic.CS0168.severity = none -dotnet_diagnostic.CS0219.severity = none -dotnet_diagnostic.CS0108.severity = none -dotnet_diagnostic.CS0120.severity = none - -dotnet_diagnostic.CS8620.severity = none -dotnet_diagnostic.CS8619.severity = none -dotnet_diagnostic.CS0162.severity = none -dotnet_diagnostic.CS0472.severity = none - -dotnet_diagnostic.CS8629.severity = none -dotnet_diagnostic.CS8073.severity = none -dotnet_diagnostic.CS0414.severity = none -dotnet_diagnostic.CS1573.severity = none -dotnet_diagnostic.CS0109.severity = none dotnet_diagnostic.CS1587.severity = none - -csharp_style_prefer_method_group_conversion = true:silent -csharp_style_prefer_top_level_statements = true:silent -dotnet_diagnostic.SA1003.severity = silent -dotnet_diagnostic.SA1108.severity = silent -dotnet_diagnostic.SA1107.severity = silent +dotnet_diagnostic.CS8619.severity = none +dotnet_diagnostic.CS8620.severity = none +dotnet_diagnostic.CS8632.severity = none +dotnet_diagnostic.CS8604.severity = none [*.vb] #### 命名样式 #### From 95665f0274ae0eb99c8a598cd543377790e3ea17 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 4 Dec 2023 11:15:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A9=BA=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Infrastructure/_IRaCIS/IQueryableExtensions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Infrastructure/_IRaCIS/IQueryableExtensions.cs b/IRaCIS.Core.Infrastructure/_IRaCIS/IQueryableExtensions.cs index f5e9f8b00..c63e27389 100644 --- a/IRaCIS.Core.Infrastructure/_IRaCIS/IQueryableExtensions.cs +++ b/IRaCIS.Core.Infrastructure/_IRaCIS/IQueryableExtensions.cs @@ -22,7 +22,7 @@ namespace IRaCIS.Core.Infrastructure.Extention if (result == null) { - throw new QueryBusinessObjectNotExistException($"The query object does not exist in database, Please check the query parameters"); + throw new QueryBusinessObjectNotExistException($"The query object {typeof(TSource).Name} does not exist in database, Please check the query parameters"); } else {