Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -1764,6 +1764,19 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.CalculateTargetLesionStatus(IRaCIS.Core.Application.ViewModel.CalculateTargetLesionStatusInDto)">
+            <summary>
+            计算靶病灶状态
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.GetSplitPPdSum(IRaCIS.Core.Application.ViewModel.GetSplitPPdInDto)">
+            <summary>
+            获取分裂病灶的PPd之和 不包括当前的主病灶
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.AddTaskLesionAnswerFromLastTask(IRaCIS.Core.Application.ViewModel.AddTaskLesionAnswerFromLastTaskInDto)">
             <summary>
             将上一次的访视病灶添加到这一次

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs

@@ -1398,7 +1398,7 @@ namespace IRaCIS.Application.Services
 
 
         /// <summary>
-        /// 拆分病灶
+        /// 拆分病灶 分裂病灶
         /// </summary>
         /// <returns></returns>
         [HttpPost]
@@ -1444,7 +1444,12 @@ namespace IRaCIS.Application.Services
             });
             await _readingTableAnswerRowInfoRepository.AddAsync(rowAnswer);
             await _readingTableQuestionAnswerRepository.AddRangeAsync(tableAnswers);
-            await _readingTableAnswerRowInfoRepository.SaveChangesAsync();
+            await _readingTableAnswerRowInfoRepository.UpdatePartialFromQueryAsync(x => x.Id == inDto.RowId, x => new ReadingTableAnswerRowInfo()
+            {
+                SplitOrMergeType = SplitOrMergeType.SplitMain
+            });
+
+			await _readingTableAnswerRowInfoRepository.SaveChangesAsync();
 
         }
 

IRaCIS.Core.Application/Service/ReadingCalculate/Dto/CriterionCalculateDto.cs

@@ -26,6 +26,8 @@ namespace IRaCIS.Core.Application.ViewModel
 	{
 		public Guid RowId { get; set; }
 
+        public string RowIndex { get; set; }
+
 		public decimal AllPPD { get; set; }
 	}
 

IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs

@@ -1028,12 +1028,13 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 					x.RowIndex,
 					Answer = x.Answer.IsNullOrEmptyReturn0()
 				}).ToList();
-				var maxRowIndex = answerList.Max(x => x.RowIndex);
+				var maxRowIndex = answerList.MaxOrDefault(x => x.RowIndex);
 				for (int i = 1; i < maxRowIndex; i++)
 				{
 					result.Add(new GetSplitPPdOutDto()
 					{
 						RowId = answerList.Where(x => x.RowIndex == i).Select(x => x.RowId).FirstOrDefault(),
+                        RowIndex = answerList.Where(x => x.RowIndex == i).Select(x => x.RowIndex).FirstOrDefault().ToString(),
 						AllPPD = answerList.Where(x => x.RowIndex > i && x.RowIndex < (i + 1)).Sum(x => x.Answer),
 					});
 				}

IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs

@@ -633,27 +633,32 @@ namespace IRaCIS.Core.Domain.Share
     }
 
 
-    /// <summary>
+	/// <summary>
-    /// 病灶分裂或合并
+	/// 病灶分裂或合并
-    /// </summary>
+	/// </summary>
-    public enum SplitOrMergeType
+	public enum SplitOrMergeType
-    {
+	{
+		/// <summary>
+		/// 分裂
+		/// </summary>
+		Split = 0,
 
-        /// <summary>
+		/// <summary>
-        /// 分裂
+		/// 合并
-        /// </summary>
+		/// </summary>
-        Split = 0,
+		Merge = 1,
 
-        /// <summary>
+		/// <summary>
-        /// 合并
+		/// 分裂主病灶
-        /// </summary>
+		/// </summary>
-        Merge = 1
+		SplitMain = 2,
-    }
 
-    /// <summary>
+	}
-    /// 是否存在或者NA
+
-    /// </summary>
+	/// <summary>
-    public enum ExistOrNA
+	/// 是否存在或者NA
+	/// </summary>
+	public enum ExistOrNA
     {
         /// <summary>
         /// NA