From 139e063bd8d531713cd24f9a5a4e9ffc3456c379 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 22 Sep 2022 11:48:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reading/ReadingCalculateService.cs        | 22 ++++++++++++++
 .../Reading/ReadingImageTaskService.cs        |  4 +--
 IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs  | 30 +++++++++++++++++++
 3 files changed, 54 insertions(+), 2 deletions(-)

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 是否存在疾病
+		/// <summary>
+		/// 是否存在疾病
+		/// </summary>
+		/// <param name="inDto"></param>
+		/// <returns></returns>
+		public async Task<string> 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";
     }
 
+
+
+    /// <summary>
+    /// 是否存在疾病
+    /// </summary>
+    public enum ExistDisease
+    {
+
+        /// <summary>
+        /// 无
+        /// </summary>
+        None = 0,
+
+        /// <summary>
+        /// 是
+        /// </summary>
+        Yes = 1,
+
+        /// <summary>
+        /// 否
+        /// </summary>
+        No = 2
+    }
+
+
     /// <summary>
     /// 病灶分裂或合并
     /// </summary>
@@ -671,6 +696,11 @@ namespace IRaCIS.Core.Domain.Share
         /// 访视点备注
         /// </summary>
         AdjustReason = 14,
+
+        /// <summary>
+        /// 是否存在疾病
+        /// </summary>
+        ExistDisease = 15,
     }
 
     /// <summary>