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

@@ -957,8 +957,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                         tableRowAnswers.ForEach(x =>
                         {
-                            x.SplitRowId = tableRowAnswers.Where(y => y.OriginalId == x.SplitRowId).FirstOrDefault()?.Id;
-                            x.MergeRowId = tableRowAnswers.Where(y => y.OriginalId == x.MergeRowId).FirstOrDefault()?.Id;
+                            x.SplitRowId = tableRowAnswers.Where(y => y.OriginalId == x.SplitRowId).Select(y => y.Id).FirstOrDefault();
+                            x.MergeRowId = tableRowAnswers.Where(y => y.OriginalId == x.MergeRowId).Select(y => y.Id).FirstOrDefault();
 
                         });
 

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

@@ -1439,9 +1439,14 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                         await _readingTableQuestionAnswerRepository.SaveChangesAsync();
                     }
                     await _readingTaskQuestionMarkRepository.AddRangeAsync(questionMarkList);
-                  
+                    //await _readingTableAnswerRowInfoRepository.AddRangeAsync(addList);
                     await _readingTableQuestionAnswerRepository.AddRangeAsync(tableAnswers);
+                    //addList.ForEach(x =>
+                    //{
+                    //    x.MergeRow = null;
+                    //    x.SplitRow = null;
 
+                    //});
                     await _readingTableQuestionAnswerRepository.SaveChangesAsync();
 
                 }

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

@@ -1440,9 +1440,14 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                         await _readingTableQuestionAnswerRepository.SaveChangesAsync();
                     }
                     await _readingTaskQuestionMarkRepository.AddRangeAsync(questionMarkList);
-                   
+                    //await _readingTableAnswerRowInfoRepository.AddRangeAsync(addList);
                     await _readingTableQuestionAnswerRepository.AddRangeAsync(tableAnswers);
+                    //addList.ForEach(x =>
+                    //{
+                    //    x.MergeRow = null;
+                    //    x.SplitRow = null;
 
+                    //});
                     await _readingTableQuestionAnswerRepository.SaveChangesAsync();
 
                 }

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

@@ -756,8 +756,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                     tableRowAnswers.ForEach(x =>
                     {
-                        x.SplitRowId = tableRowAnswers.Where(y => y.OriginalId == x.SplitRowId).FirstOrDefault()?.Id;
-                        x.MergeRowId = tableRowAnswers.Where(y => y.OriginalId == x.MergeRowId).FirstOrDefault()?.Id;
+                        x.SplitRowId = tableRowAnswers.Where(y => y.OriginalId == x.SplitRowId).Select(y => y.Id).FirstOrDefault();
+                        x.MergeRowId = tableRowAnswers.Where(y => y.OriginalId == x.MergeRowId).Select(y => y.Id).FirstOrDefault();
 
                     });
 
@@ -788,6 +788,13 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                     await _readingTableAnswerRowInfoRepository.AddRangeAsync(addList);
                     await _readingTableQuestionAnswerRepository.AddRangeAsync(tableAnswers);
+
+                    addList.ForEach(x =>
+                    {
+                        x.MergeRow = null;
+                        x.SplitRow = null;
+
+                    });
                     await _readingTableQuestionAnswerRepository.SaveChangesAsync();
 
                 }

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

@@ -409,8 +409,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                     tableRowAnswers.ForEach(x =>
                     {
-                        x.SplitRowId = tableRowAnswers.Where(y => y.OriginalId == x.SplitRowId).FirstOrDefault()?.Id;
-                        x.MergeRowId = tableRowAnswers.Where(y => y.OriginalId == x.MergeRowId).FirstOrDefault()?.Id;
+                        x.SplitRowId = tableRowAnswers.Where(y => y.OriginalId == x.SplitRowId).Select(y => y.Id).FirstOrDefault();
+                        x.MergeRowId = tableRowAnswers.Where(y => y.OriginalId == x.MergeRowId).Select(y => y.Id).FirstOrDefault();
 
                     });
 

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

@@ -754,9 +754,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                     tableRowAnswers.ForEach(x =>
                     {
-                 
-                        x.SplitRowId = tableRowAnswers.Where(y => y.OriginalId == x.SplitRowId).FirstOrDefault()?.Id;
-                        x.MergeRowId = tableRowAnswers.Where(y => y.OriginalId == x.MergeRowId).FirstOrDefault()?.Id;
+                        var rowinfo= tableRowAnswers.Where(y => y.OriginalId == x.SplitRowId).FirstOrDefault();
+                        x.SplitRowId = tableRowAnswers.Where(y => y.OriginalId == x.SplitRowId).Select(y => y.Id).FirstOrDefault();
+                        x.MergeRowId = tableRowAnswers.Where(y => y.OriginalId == x.MergeRowId).Select(y => y.Id).FirstOrDefault();
 
                     });
 
@@ -787,6 +787,12 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     await _readingTableAnswerRowInfoRepository.AddRangeAsync(addList);
                     await _readingTableQuestionAnswerRepository.AddRangeAsync(tableAnswers);
 
+                    addList.ForEach(x =>
+                    {
+                        x.MergeRow = null;
+                        x.SplitRow = null;
+
+                    });
                     await _readingTableQuestionAnswerRepository.SaveChangesAsync();
 
                 }

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

@@ -760,8 +760,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                     tableRowAnswers.ForEach(x =>
                     {
-                       x.SplitRowId = tableRowAnswers.Where(y => y.OriginalId == x.SplitRowId).FirstOrDefault()?.Id;
-                       x.MergeRowId = tableRowAnswers.Where(y => y.OriginalId == x.MergeRowId).FirstOrDefault()?.Id;
+                        x.SplitRowId = tableRowAnswers.Where(y => y.OriginalId == x.SplitRowId).Select(y => y.Id).FirstOrDefault();
+                        x.MergeRowId = tableRowAnswers.Where(y => y.OriginalId == x.MergeRowId).Select(y => y.Id).FirstOrDefault();
 
                     });
 

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

@@ -463,8 +463,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                     tableRowAnswers.ForEach(x =>
                     {
-                        x.SplitRowId = tableRowAnswers.Where(y => y.OriginalId == x.SplitRowId).FirstOrDefault()?.Id;
-                        x.MergeRowId = tableRowAnswers.Where(y => y.OriginalId == x.MergeRowId).FirstOrDefault()?.Id;
+                        x.SplitRowId = tableRowAnswers.Where(y => y.OriginalId == x.SplitRowId).Select(y => y.Id).FirstOrDefault();
+                        x.MergeRowId = tableRowAnswers.Where(y => y.OriginalId == x.MergeRowId).Select(y => y.Id).FirstOrDefault();
 
                     });