From fbaf78d18e64f26873216a98bf1d7b9251e2d13e Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 13 Oct 2023 14:40:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8C=85=E7=89=88=E6=9C=AC=E5=9B=9E?=
=?UTF-8?q?=E9=80=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
IRaCIS.Core.API/IRaCIS.Core.API.xml | 101 +-----------------
IRaCIS.Core.API/_ServiceExtensions/EFSetup.cs | 2 +-
IRaCIS.Core.Domain/Allocation/VisitTask.cs | 3 +-
IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj | 1 +
.../IRaCIS.Core.Infra.EFCore.csproj | 1 +
5 files changed, 6 insertions(+), 102 deletions(-)
diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.xml b/IRaCIS.Core.API/IRaCIS.Core.API.xml
index d07789653..96f6f9d06 100644
--- a/IRaCIS.Core.API/IRaCIS.Core.API.xml
+++ b/IRaCIS.Core.API/IRaCIS.Core.API.xml
@@ -268,68 +268,10 @@
Dicom 归档
-
-
- 上传临床数据 多文件
-
-
-
-
-
-
- 上传临床数据模板
-
-
-
-
-
-
- 上传阅片临床数据
-
-
-
-
-
-
-
-
- 上传截图
-
-
-
-
-
-
- 上传Reading问题的图像
-
-
-
-
-
-
-
- 上传裁判任务的图像
-
-
-
-
-
-
-
- 上传医学审核图片
-
-
-
-
-
-
+
上传非Dicom 文件 支持压缩包 多文件上传
-
-
-
-
@@ -382,53 +324,12 @@
要下载的附件Id
-
- 缩略图
-
-
- 通用文件下载
-
-
-
- 下载项目临床数据文件
-
-
-
-
-
-
-
- 下载系统临床数据文件
-
-
-
-
-
-
-
- 上传项目签名文档
-
-
-
-
-
-
- 上传系统签名文档
-
-
-
上传通用文档 比如一致性核查的 比如导出的excel 模板
-
-
- 上传系统通知文档
-
-
-
1：数据上传 2：导出、 3：邮件附件 4：邮件Html 通过 ----new
diff --git a/IRaCIS.Core.API/_ServiceExtensions/EFSetup.cs b/IRaCIS.Core.API/_ServiceExtensions/EFSetup.cs
index c3d3700d1..3a7df5742 100644
--- a/IRaCIS.Core.API/_ServiceExtensions/EFSetup.cs
+++ b/IRaCIS.Core.API/_ServiceExtensions/EFSetup.cs
@@ -27,7 +27,7 @@ namespace IRaCIS.Core.API
options.AddInterceptors(new QueryWithNoLockDbCommandInterceptor());
- //options.UseProjectables();
+ options.UseProjectables();
//options.AddInterceptors(new AuditingInterceptor(configuration.GetSection("ConnectionStrings:RemoteNew").Value));
diff --git a/IRaCIS.Core.Domain/Allocation/VisitTask.cs b/IRaCIS.Core.Domain/Allocation/VisitTask.cs
index e0568cebd..73daba8ce 100644
--- a/IRaCIS.Core.Domain/Allocation/VisitTask.cs
+++ b/IRaCIS.Core.Domain/Allocation/VisitTask.cs
@@ -9,6 +9,7 @@ using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Collections.Generic;
using System.Linq;
+using EntityFrameworkCore.Projectables;
namespace IRaCIS.Core.Domain.Models
{
@@ -323,7 +324,7 @@ namespace IRaCIS.Core.Domain.Models
public Guid? BeforeConvertedTaskId { get; set; }
- [NotMapped]
+ [Projectable]
[JsonIgnore]
public bool IsConvertedTask => BeforeConvertedTaskId != null || IsHistoryConvertedTask|| Subject.SubjectVisitTaskList.Where(t => t.TrialReadingCriterionId == TrialReadingCriterionId
&& t.DoctorUserId == DoctorUserId && t.BeforeConvertedTaskId != null
diff --git a/IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj b/IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj
index d19daa8d4..db04254d7 100644
--- a/IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj
+++ b/IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj
@@ -17,6 +17,7 @@
+
diff --git a/IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj b/IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj
index 492899965..6cc41d365 100644
--- a/IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj
+++ b/IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj
@@ -18,6 +18,7 @@
+
From e6a909bba07e652cea43baec2a49562b697a68cf Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 13 Oct 2023 15:05:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9nuget=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
IRaCIS.Core.Application/IRaCIS.Core.Application.csproj | 4 +---
IRaCIS.Core.Application/IRaCIS.Core.Application.xml | 2 +-
IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj | 6 +++---
.../Repository/IRaCISContextExtension.cs | 2 +-
.../IRaCIS.Core.Infrastructure.csproj | 3 ++-
5 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj b/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj
index 5e1574265..18b317d53 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj
@@ -63,11 +63,9 @@
-
-
+
-
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 38559fb74..3d4f9bf33 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -13213,7 +13213,7 @@
- 提交表格问题答案 病灶
+ 提交表格问题答案 提交病灶
diff --git a/IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj b/IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj
index 6cc41d365..c763a7435 100644
--- a/IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj
+++ b/IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj
@@ -17,11 +17,11 @@
-
+
+
-
+
-
diff --git a/IRaCIS.Core.Infra.EFCore/Repository/IRaCISContextExtension.cs b/IRaCIS.Core.Infra.EFCore/Repository/IRaCISContextExtension.cs
index 0687678aa..07246c223 100644
--- a/IRaCIS.Core.Infra.EFCore/Repository/IRaCISContextExtension.cs
+++ b/IRaCIS.Core.Infra.EFCore/Repository/IRaCISContextExtension.cs
@@ -160,7 +160,7 @@ namespace IRaCIS.Core.Infra.EFCore
{
if (deleteFilter == null) throw new ArgumentNullException(nameof(deleteFilter));
- return await _dbContext.Set().IgnoreQueryFilters().Where(deleteFilter).ExecuteDeleteAsync() > 0;
+ return await _dbContext.Set().IgnoreQueryFilters().Where(deleteFilter).BatchDeleteAsync() > 0;
}
diff --git a/IRaCIS.Core.Infrastructure/IRaCIS.Core.Infrastructure.csproj b/IRaCIS.Core.Infrastructure/IRaCIS.Core.Infrastructure.csproj
index 881affa42..086de1dce 100644
--- a/IRaCIS.Core.Infrastructure/IRaCIS.Core.Infrastructure.csproj
+++ b/IRaCIS.Core.Infrastructure/IRaCIS.Core.Infrastructure.csproj
@@ -10,8 +10,9 @@
+
-
+