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

@@ -801,10 +801,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                             {
                                 var rowId = tableRowAnswers.Where(y => y.OriginalId == x.RowId).Select(y => y.Id).FirstOrDefault();
                                 var answer = notNeedCopyMarks.Contains(x.QuestionMark) ? string.Empty : x.Answer;
-                                if (mergedRowIds.Contains(rowId) && (x.QuestionMark == QuestionMark.State || x.QuestionMark == QuestionMark.ShortAxis || x.QuestionMark == QuestionMark.MajorAxis))
-                                {
-                                    answer = x.Answer;
-                                }
+                                if (mergedRowIds.Contains(rowId) && x.QuestionMark == QuestionMark.State)
+                                    answer = TargetState.Loss.GetEnumInt().ToString();
                                 return new ReadingTableQuestionAnswer
                                 {
                                     Id = NewId.NextGuid(),

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

@@ -603,11 +603,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                         {
                             var rowId = tableRowAnswers.Where(y => y.OriginalId == x.RowId).Select(y => y.Id).FirstOrDefault();
                             var answer = notNeedCopyMarks.Contains(x.QuestionMark) ? string.Empty : x.Answer;
-                            if (mergedRowIds.Contains(rowId) && (x.QuestionMark == QuestionMark.State || x.QuestionMark == QuestionMark.ShortAxis || x.QuestionMark == QuestionMark.MajorAxis))
-                            {
-                                answer = x.Answer;
-                            }
-
+                            if (mergedRowIds.Contains(rowId) && x.QuestionMark == QuestionMark.State)
+                                answer = TargetState.Loss.GetEnumInt().ToString();
                             return new ReadingTableQuestionAnswer
                             {
                                 Id = NewId.NextGuid(),

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

@@ -606,10 +606,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                         {
                             var rowId = tableRowAnswers .Where(y => y.OriginalId == x.RowId) .Select(y => y.Id).FirstOrDefault();
                             var answer = notNeedCopyMarks.Contains(x.QuestionMark) ? string.Empty: x.Answer;
-                            if (mergedRowIds.Contains(rowId) && (x.QuestionMark == QuestionMark.State || x.QuestionMark == QuestionMark.ShortAxis || x.QuestionMark == QuestionMark.MajorAxis))
-                            {
-                                answer = x.Answer;
-                            }
+                            if (mergedRowIds.Contains(rowId) && x.QuestionMark == QuestionMark.State)
+                                answer = TargetState.Loss.GetEnumInt().ToString();
                             return new ReadingTableQuestionAnswer
                             {
                                 Id = NewId.NextGuid(),

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

@@ -606,10 +606,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                         {
                             var rowId = tableRowAnswers.Where(y => y.OriginalId == x.RowId).Select(y => y.Id).FirstOrDefault();
                             var answer = notNeedCopyMarks.Contains(x.QuestionMark) ? string.Empty : x.Answer;
-                            if (mergedRowIds.Contains(rowId) && (x.QuestionMark == QuestionMark.State || x.QuestionMark == QuestionMark.ShortAxis || x.QuestionMark == QuestionMark.MajorAxis))
-                            {
-                                answer = x.Answer;
-                            }
+                            if (mergedRowIds.Contains(rowId) && x.QuestionMark == QuestionMark.State)
+                                answer = TargetState.Loss.GetEnumInt().ToString();
                             return new ReadingTableQuestionAnswer
                             {
                                 Id = NewId.NextGuid(),