diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index f1fecf227..5b5d1d667 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -6799,6 +6799,16 @@
分组
+
+
+ 分类算法
+
+
+
+
+ 分类问题Id
+
+
全局阅片显示类型
@@ -7544,6 +7554,16 @@
Id
+
+
+ 分类算法
+
+
+
+
+ 分类问题Id
+
+
是否复制病灶
diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs
index 40e66de8d..0e3e5c184 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs
@@ -765,7 +765,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
if (_provider.Exists($"StudyUid_{trialId}_{studyInstanceUid}"))
{
-
+
result.AllowUpload = false;
result.AllowReUpload = false;
@@ -834,6 +834,13 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
_provider.Set($"StudyUid_{trialId}_{studyInstanceUid}", _userInfo.Id, TimeSpan.FromSeconds(30));
}
}
+ else
+ {
+ lock (lockObj)
+ {
+ _provider.Remove($"StudyUid_{trialId}_{studyInstanceUid}");
+ }
+ }
return result;
}
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
index 89b0b5bb0..37b96be24 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
@@ -812,9 +812,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
///
public string GroupName { get; set; }
+ ///
+ /// 分类算法
+ ///
+ public string ClassifyAlgorithms { get; set; } = string.Empty;
-
- public Guid? GroupId { get; set; }
+ ///
+ /// 分类问题Id
+ ///
+ public Guid? ClassifyQuestionId { get; set; }
+
+ public Guid? GroupId { get; set; }
///
/// 全局阅片显示类型
@@ -1775,6 +1783,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public Guid? Id { get; set; }
public bool IsAdditional { get; set; }
+
+ ///
+ /// 分类算法
+ ///
+ public string ClassifyAlgorithms { get; set; } = string.Empty;
+
+ ///
+ /// 分类问题Id
+ ///
+ public Guid? ClassifyQuestionId { get; set; }
public Guid TrialId { get; set; }
///
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 597da38e2..64e883d17 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -2040,7 +2040,7 @@ namespace IRaCIS.Application.Services
rowInfo.Id = inDto.RowId == null ? NewId.NextGuid() : inDto.RowId.Value;
result.RowId = rowInfo.Id;
rowInfo.IsCurrentTaskAdd = isCurrentTaskAdd;
- rowInfo.FristAddTaskId = inDto.RowId == null ? rowInfo.Id : rowInfo.FristAddTaskId;
+ rowInfo.FristAddTaskId = inDto.RowId == null ? inDto.VisitTaskId : rowInfo.FristAddTaskId;
if (inDto.RowId == null)
{
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
index 319a72c29..2a1e48f84 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
@@ -886,13 +886,20 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
List needCopyMarks = new List()
{
+
+ QuestionMark.IsLymph,
+ QuestionMark.Lesion,
+ QuestionMark.Organ,
+ QuestionMark.Location,
+ QuestionMark.Part,
+
QuestionMark.LowPPDLDi,
QuestionMark.LowPPDSDi,
QuestionMark.NadirPPD,
- QuestionMark.LowPPDVisit,
+ QuestionMark.LowPPDVisit,
};
-
+
var rowIndexList = copyTableAnswers.Select(x => x.RowIndex).Distinct().ToList();
// 找到靶病灶问题Id
@@ -951,6 +958,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
VisitTaskId= visitTaskId,
FirstAddTaskId=x.FirstAddTaskId,
QuestionId=x.QuestionId,
+ QuestionType=x.QuestionType,
}).ToListAsync();
diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs
index 771a12133..959790ed5 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs
@@ -252,9 +252,19 @@ namespace IRaCIS.Core.Domain.Models
public string GroupEnName { get; set; } = string.Empty;
///
- /// 是否复制病灶
+ /// 分类算法
///
- public bool IsCopyLesions { get; set; } = false;
+ public string ClassifyAlgorithms { get; set; } = string.Empty;
+
+ ///
+ /// 分类问题Id
+ ///
+ public Guid? ClassifyQuestionId { get; set; }
+
+ ///
+ /// 是否复制病灶
+ ///
+ public bool IsCopyLesions { get; set; } = false;
///
/// 分组ID