病灶修改

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

@@ -1098,7 +1098,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                     tableRowAnswers.ForEach(x =>
                     {
-                        x.SplitOrMergeType = null;
+                        x.SplitOrMergeType = x.SplitOrMergeType==SplitOrMergeType.Merge|| x.SplitOrMergeType == SplitOrMergeType.Merged? SplitOrMergeType.Merged : null;
                         x.VisitTaskId = visitTaskId;
                         x.IsCurrentTaskAdd = false;
                         x.Id = NewId.NextGuid();
@@ -1173,7 +1173,13 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                         });
                     }
 
-                    var tableAnswers = copyTableAnswers.Select(x => new ReadingTableQuestionAnswer
+                    var tableAnswers = new List<ReadingTableQuestionAnswer>();
+					// 处理状态
+
+					var mergedRowIds = tableRowAnswers.Where(x => x.SplitOrMergeType == SplitOrMergeType.Merged).Select(x => x.Id).ToList();
+                    copyTableAnswers.ForEach(x =>
+                    {
+                        var tableAnswer = new ReadingTableQuestionAnswer()
                         {
                             Id = NewId.NextGuid(),
                             Answer = needCopyMarks.Contains(x.QuestionMark) ? x.Answer : string.Empty,
@@ -1183,8 +1189,14 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                             TableQuestionId = x.TableQuestionId,
                             TrialId = x.TrialId,
                             VisitTaskId = visitTaskId,
-                    });
+                        };
+                        if (mergedRowIds.Contains(tableAnswer.RowId) && x.QuestionMark == QuestionMark.State)
+                        {
+                            tableAnswer.Answer = TargetState.Loss.GetEnumInt();
 
+                        }
+                        tableAnswers.Add(tableAnswer);
+                    });
 
 					 var questionMarkList = await _readingTaskQuestionMarkRepository.Where(x => x.VisitTaskId == LastVisitTaskId).Select(x => new ReadingTaskQuestionMark()
                     {

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

@@ -644,7 +644,7 @@ namespace IRaCIS.Core.Domain.Share
 		Split = 0,
 
 		/// <summary>
-		/// 合并
+		/// 融合
 		/// </summary>
 		Merge = 1,
 
@@ -653,6 +653,10 @@ namespace IRaCIS.Core.Domain.Share
 		/// </summary>
 		SplitMain = 2,
 
+        /// <summary>
+        /// 融合过 再之前任务融合了
+        /// </summary>
+		Merged=3,
 	}
 
 	/// <summary>