修改

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

@@ -107,6 +107,14 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             var criterionId = visitTaskInfo.TrialReadingCriterionId;
             var questionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == criterionId).ToListAsync();
             var tableQuestionList = await _readingTableQuestionTrialRepository.Where(x => x.TrialCriterionId == criterionId).OrderBy(x => x.ShowOrder).ToListAsync();
+
+            var lesionsIndexs = await _readingTableAnswerRowInfoRepository.Where(x => visitTaskIds.Contains(x.VisitTaskId)).GroupBy(x => new { x.QuestionId }).Select(x => new lesionsIndexDto()
+            {
+                QuestionId = x.Key.QuestionId,
+                Rowindexs = x.Select(x => x.RowIndex).Distinct().OrderBy(x => x).ToList()
+
+            }).ToListAsync();
+
             var tableAnsweRowInfos = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == indto.VisitTaskId).ProjectTo<TableAnsweRowInfo>(_mapper.ConfigurationProvider).ToListAsync();
 
             var answers = await _readingTaskQuestionAnswerRepository.Where(x => visitTaskIds.Contains(x.VisitTaskId)).ToListAsync();
@@ -191,19 +199,28 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                     var rowlist = tableAnsweRowInfos.Where(x => x.QuestionId == question.QuestionId).OrderBy(x => x.RowIndex).ToList();
 
+                    question.Childrens = new List<ReadingReportDto>();
 
-                    question.Childrens = rowlist.Select(x => new ReadingReportDto()
+                    var rowoindexs = lesionsIndexs.Where(x => x.QuestionId == question.QuestionId).Select(x => x.Rowindexs.OrderBy(y => y).ToList()).FirstOrDefault();
+
+                    foreach (var rowoindex in rowoindexs)
                     {
-                        QuestionName = question.OrderMark + x.RowIndex.GetLesionMark(),
-                        RowId=x.Id,
-                        SplitOrMergeLesionName = x.MergeName.IsNullOrEmpty() ? x.SplitName : x.MergeName,
-                        SplitOrMergeType = x.SplitOrMergeType,
-                        LesionType = question.LesionType,
-                        IsCanEditPosition = x.IsCanEditPosition,
-                        RowIndex = x.RowIndex,
-                        BlindName = x.BlindName,
-                        ReportLayType = ReportLayType.Lesions,
-                    }).ToList();
+                        var rowinfo = rowlist.Where(x => x.RowIndex == rowoindex).FirstOrDefault();
+                        question.Childrens.Add(new ReadingReportDto()
+                        {
+                            QuestionName = question.OrderMark + rowoindex.GetLesionMark(),
+                            RowId = rowinfo?.Id,
+                            SplitOrMergeLesionName = rowinfo!=null? (rowinfo.MergeName.IsNullOrEmpty() ? rowinfo.SplitName : rowinfo.MergeName):string.Empty,
+                            SplitOrMergeType = rowinfo != null ? (rowinfo.SplitOrMergeType):null,
+                            LesionType = question.LesionType,
+                            IsCanEditPosition = rowinfo != null ? (rowinfo.IsCanEditPosition):false,
+                            RowIndex = rowoindex,
+                            BlindName = rowinfo != null ? rowinfo.BlindName : string.Empty,
+                            ReportLayType = ReportLayType.Lesions,
+                        });
+                    }
+
+                  
 
 
                     foreach (var row in question.Childrens)
@@ -336,7 +353,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         public async Task<AddTaskLesionAnswerFromLastTaskOutDto> AddTaskLesionAnswerFromLastTask(AddTaskLesionAnswerFromLastTaskInDto inDto)
         {
             var visitTaskId = inDto.VisitTaskId;
-
             var taskinfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).FirstNotNullAsync();
 
             var baseLineVisitId = await _subjectVisitRepository.Where(x => x.SubjectId == taskinfo.SubjectId && x.IsBaseLine).Select(x => x.Id).FirstOrDefaultAsync();
@@ -358,7 +374,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
 
 
-                    var copyTableAnswers = await _readingTableQuestionAnswerRepository.Where(x => x.VisitTaskId == LastVisitTaskId).Select(x => new CopyTableAnswerDto()
+                    var copyTableAnswers = await _readingTableQuestionAnswerRepository.Where(x => x.VisitTaskId == LastVisitTaskId&&x.ReadingQuestionTrial.IsCopyLesions).Select(x => new CopyTableAnswerDto()
                     {
                         Answer = x.Answer,
                         QuestionId = x.QuestionId,
@@ -366,10 +382,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                         QuestionMark = x.ReadingTableQuestionTrial.QuestionMark,
                         TableQuestionId = x.TableQuestionId,
                         RowIndex = x.RowIndex,
-                        TrialId = x.TrialId
+                        IsCopy=x.ReadingTableQuestionTrial.IsCopy,
+                        TrialId = x.TrialId,
                     }).ToListAsync();
 
-                    var tableRowAnswers = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == LastVisitTaskId).ProjectTo<CopyTableAnswerRowInfo>(_mapper.ConfigurationProvider).ToListAsync();
+                    var tableRowAnswers = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == LastVisitTaskId&&x.ReadingQuestionTrial.IsCopyLesions).ProjectTo<CopyTableAnswerRowInfo>(_mapper.ConfigurationProvider).ToListAsync();
 
 
                     tableRowAnswers.ForEach(x =>
@@ -390,17 +407,12 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                     });
 
-                    List<QuestionMark?> notNeedCopyMarks = new List<QuestionMark?>()
-                    {
-                         QuestionMark.MajorAxis,
-                         QuestionMark.ShortAxis,
-                         QuestionMark.State,
-                    };
+                  
 
                     var tableAnswers = copyTableAnswers.Select(x => new ReadingTableQuestionAnswer
                     {
                         Id = NewId.NextGuid(),
-                        Answer = notNeedCopyMarks.Contains(x.QuestionMark) ? string.Empty : x.Answer,
+                        Answer = x.IsCopy ? x.Answer:string.Empty ,
                         QuestionId = x.QuestionId,
                         RowIndex = x.RowIndex,
                         RowId = tableRowAnswers.Where(y => y.OriginalId == x.RowId).Select(x => x.Id).FirstOrDefault(),