From 797b076705d8259c2d89cf9bee0e911f54645227 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 10 Apr 2026 17:22:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7fo-dicom=20=E4=BB=A5=E5=8F=8A?=
=?UTF-8?q?=E6=BC=8F=E6=B4=9E=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
IRC.Core.Dicom/IRC.Core.Dicom.csproj | 5 +--
IRC.Core.SCP/IRC.Core.SCP.csproj | 32 ++++++++---------
IRaCIS.Core.API/IRaCIS.Core.API.csproj | 3 ++
IRaCIS.Core.API/appsettings.Prod_IRC.json | 4 +--
.../IRaCIS.Core.Application.csproj | 34 +++++++++----------
.../IRaCIS.Core.Application.xml | 7 ++++
.../TrialSiteUser/TrialConfigService.cs | 10 +++---
IRaCIS.Core.Application/TestService.cs | 30 +++++++++++++++-
.../IRaCIS.Core.Infra.EFCore.csproj | 4 +++
9 files changed, 86 insertions(+), 43 deletions(-)
diff --git a/IRC.Core.Dicom/IRC.Core.Dicom.csproj b/IRC.Core.Dicom/IRC.Core.Dicom.csproj
index d30f32218..3a9fd6fda 100644
--- a/IRC.Core.Dicom/IRC.Core.Dicom.csproj
+++ b/IRC.Core.Dicom/IRC.Core.Dicom.csproj
@@ -12,8 +12,9 @@
-
-
+
+
+
diff --git a/IRC.Core.SCP/IRC.Core.SCP.csproj b/IRC.Core.SCP/IRC.Core.SCP.csproj
index ca9724a3b..b44373939 100644
--- a/IRC.Core.SCP/IRC.Core.SCP.csproj
+++ b/IRC.Core.SCP/IRC.Core.SCP.csproj
@@ -7,28 +7,28 @@
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
true
-
-
-
-
-
+
+
+
+
+
diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.csproj b/IRaCIS.Core.API/IRaCIS.Core.API.csproj
index 9361510e9..35008effe 100644
--- a/IRaCIS.Core.API/IRaCIS.Core.API.csproj
+++ b/IRaCIS.Core.API/IRaCIS.Core.API.csproj
@@ -11,6 +11,9 @@
IRC影像系统 (EICS)
上海展影医疗科技有限公司版权所有
+
+ false
+
.\IRaCIS.Core.API.xml
diff --git a/IRaCIS.Core.API/appsettings.Prod_IRC.json b/IRaCIS.Core.API/appsettings.Prod_IRC.json
index f41c9b39b..5d8bb58bb 100644
--- a/IRaCIS.Core.API/appsettings.Prod_IRC.json
+++ b/IRaCIS.Core.API/appsettings.Prod_IRC.json
@@ -7,8 +7,8 @@
}
},
"ConnectionStrings": {
- "RemoteNew": "Server=101.132.193.237,1434;Database=Prod_IRC;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true",
- "Hangfire": "Server=101.132.193.237,1434;Database=Prod_IRC_Hangfire;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true"
+ "RemoteNew": "Server=10.10.10.49,1434;Database=Prod_IRC;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true",
+ "Hangfire": "Server=10.10.10.49,1434;Database=Prod_IRC_Hangfire;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true"
//"RemoteNew": "Server=prod_mssql_standard,1433;Database=Prod_IRC;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true",
//"Hangfire": "Server=prod_mssql_standard,1433;Database=Prod_IRC_Hangfire;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true"
},
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj b/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj
index 6e664dc21..932767881 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj
@@ -33,36 +33,36 @@
-
-
+
-
-
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+
-
+
true
-
-
+
+
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 177c3aba5..c979954d9 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -15904,6 +15904,13 @@
+
+
+ 设置生命周期
+
+
+
+
测试疗效评估
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
index ae4a52c6d..7a4a6cdb5 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
@@ -341,7 +341,7 @@ namespace IRaCIS.Core.Application
foreach (var item in systemCriterionKeyFile)
{
- var path = await _oSSService.UploadToOSSAsync(item.FilePath, $"{trialCriterion.TrialId}/ReadingModule/{trialCriterion.CriterionName}", true, true, uploadInfo: new FileUploadRecordAddOrEdit() { TrialId = trialCriterion.TrialId ,BatchDataType=BatchDataType.ReadingKeyFile });
+ var path = await _oSSService.UploadToOSSAsync(item.FilePath, $"{trialCriterion.TrialId}/ReadingModule/{trialCriterion.CriterionName}", true, true, uploadInfo: new FileUploadRecordAddOrEdit() { TrialId = trialCriterion.TrialId, BatchDataType = BatchDataType.ReadingKeyFile });
trialCriterionKeyFiles.Add(new TrialCriterionKeyFile
{
@@ -611,8 +611,8 @@ namespace IRaCIS.Core.Application
toolList = toolList.Distinct().ToList();
- var alltool= trialCriterion.ReadingToolList.Union(trialCriterion.SegmentToolList).ToList();
-
+ var alltool = trialCriterion.ReadingToolList.Union(trialCriterion.SegmentToolList).ToList();
+
if (tabletoolList.Except(alltool).Count() > 0)
{
@@ -633,7 +633,7 @@ namespace IRaCIS.Core.Application
await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(inDto.TrialReadingCriterionId, x => new ReadingQuestionCriterionTrial()
{
ReadingToolList = inDto.ReadingToolList,
- SegmentToolList= inDto.SegmentToolList,
+ SegmentToolList = inDto.SegmentToolList,
IsImageFilter = inDto.IsImageFilter,
ImageDownloadEnum = inDto.ImageDownloadEnum,
ImageUploadEnum = inDto.ImageUploadEnum,
@@ -1332,7 +1332,7 @@ namespace IRaCIS.Core.Application
await _trialRepository.BatchUpdateNoTrackingAsync(u => u.Id == trialId, s => new Trial { TrialFinishedTime = DateTime.Now });
- if (_readingQuestionCriterionTrialRepository.Any(t => t.IsSigned && t.ImageUploadEnum != ReadingImageUpload.None))
+ if (_readingQuestionCriterionTrialRepository.Any(t => t.TrialId == trial.Id && t.IsSigned && t.ImageUploadEnum != ReadingImageUpload.None))
{
await _oSSService.SetImmediateArchiveRule($"{trial.Id}/Image/");
await _oSSService.SetImmediateArchiveRule($"{trial.Id}/TaskImage/");
diff --git a/IRaCIS.Core.Application/TestService.cs b/IRaCIS.Core.Application/TestService.cs
index 1af2f3c11..4dc4dbef4 100644
--- a/IRaCIS.Core.Application/TestService.cs
+++ b/IRaCIS.Core.Application/TestService.cs
@@ -114,7 +114,7 @@ namespace IRaCIS.Core.Application.Service
public async Task PostModelVerify(ModelVerifyCommand modelVerify)
{
var webhook = "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=cdd97aab-d256-4f07-9145-a0a2b1555322";
- //await WeComNotifier.SendErrorAsync(webhook, "http://irc.test.extimaging.com/login", new Exception("测试异常"), new[] { "ZhouHang" });
+ //await WeComNotifier.SendErrorAsync(webhook, "http://irc.test.extimaging.com/login", new Exception("测试异常"), new[] { "ZhouHang" });
//throw new Exception("手动测试异常抛出");
return ResponseOutput.Ok(_userInfo.Domain);
@@ -122,6 +122,34 @@ namespace IRaCIS.Core.Application.Service
}
+ ///
+ /// 设置生命周期
+ ///
+ ///
+ ///
+ [AllowAnonymous]
+ public async Task SetTrialLifeCycel(ModelVerifyCommand modelVerify)
+ {
+ var trialIdList = _trialRepository.Where(t => t.TrialStatusStr == StaticData.TrialState.TrialCompleted).Select(t => t.Id).ToList();
+
+ foreach (var trialId in trialIdList)
+ {
+ if (_readingQuestionCriterionTrialRepository.Any(t => t.TrialId == trialId && t.IsSigned && t.ImageUploadEnum != ReadingImageUpload.None))
+ {
+ await _IOSSService.SetImmediateArchiveRule($"{trialId}/Image/");
+ await _IOSSService.SetImmediateArchiveRule($"{trialId}/TaskImage/");
+
+ }
+ else
+ {
+ await _IOSSService.SetImmediateArchiveRule($"{trialId}/Image/");
+ }
+ }
+
+ return ResponseOutput.Ok();
+ }
+
+
[AllowAnonymous]
public async Task CreatNewDBStruct()
diff --git a/IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj b/IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj
index d0b656afe..6544481c9 100644
--- a/IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj
+++ b/IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj
@@ -6,6 +6,10 @@
net8.0
+
+ false
+
+
..\bin