diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCalculateService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCalculateService.cs
index dd9a93b3a..b77f09feb 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingCalculateService.cs
@@ -133,6 +133,9 @@ namespace IRaCIS.Core.Application.Service
//整体肿瘤评估
new ReadingCalculateData (){QuestionType=QuestionType.Tumor,GetStringFun=GetTumor},
+ //是否存在疾病
+ new ReadingCalculateData (){QuestionType=QuestionType.ExistDisease,GetStringFun=GetIsExistDisease},
+
};
@@ -663,6 +666,25 @@ namespace IRaCIS.Core.Application.Service
}
#endregion
+ #region 是否存在疾病
+ ///
+ /// 是否存在疾病
+ ///
+ ///
+ ///
+ public async Task GetIsExistDisease(ReadingCalculateDto inDto)
+ {
+ if (!inDto.IsBaseLine)
+ {
+ return string.Empty;
+ }
+
+ var lesionCount = inDto.QuestionInfo.SelectMany(x => x.TableRowInfoList).Count();
+
+ return lesionCount>0 ? ExistDisease.Yes.GetEnumInt() : ExistDisease.No.GetEnumInt();
+ }
+ #endregion
+
#region 修改其他标准
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index 1fd4df7db..2575eed5d 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -337,7 +337,7 @@ namespace IRaCIS.Application.Services
- var LastVisitTaskId = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&x.VisitTaskNum< taskinfo.VisitTaskNum&&x.TaskState==TaskState.Effect&&x.ArmEnum==taskinfo.ArmEnum
+ var LastVisitTaskId = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit&&x.SubjectId==taskinfo.SubjectId&&x.ReadingTaskState==ReadingTaskState.HaveSigned &&x.VisitTaskNum< taskinfo.VisitTaskNum&&x.TaskState==TaskState.Effect&&x.ArmEnum==taskinfo.ArmEnum
).OrderByDescending(x=>x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync();
@@ -356,7 +356,7 @@ namespace IRaCIS.Application.Services
tableRowAnswers.ForEach(x =>
{
-
+ x.VisitTaskId = visitTaskId;
x.Id = NewId.NextGuid();
});
diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
index c53d84cf0..4bf4fc194 100644
--- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
+++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
@@ -16,6 +16,31 @@ namespace IRaCIS.Core.Domain.Share
public static readonly string Group = "group";
}
+
+
+ ///
+ /// 是否存在疾病
+ ///
+ public enum ExistDisease
+ {
+
+ ///
+ /// 无
+ ///
+ None = 0,
+
+ ///
+ /// 是
+ ///
+ Yes = 1,
+
+ ///
+ /// 否
+ ///
+ No = 2
+ }
+
+
///
/// 病灶分裂或合并
///
@@ -671,6 +696,11 @@ namespace IRaCIS.Core.Domain.Share
/// 访视点备注
///
AdjustReason = 14,
+
+ ///
+ /// 是否存在疾病
+ ///
+ ExistDisease = 15,
}
///