diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs
new file mode 100644
index 000000000..0979886aa
--- /dev/null
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs
@@ -0,0 +1,764 @@
+using IRaCIS.Core.Application.Service.Reading.Dto;
+using IRaCIS.Core.Domain.Share;
+using Microsoft.AspNetCore.Mvc;
+using IRaCIS.Core.Domain.Models;
+using IRaCIS.Core.Application.Interfaces;
+using IRaCIS.Core.Application.ViewModel;
+using Panda.DynamicWebApi.Attributes;
+using IRaCIS.Core.Infra.EFCore.Common;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.Logging;
+using IRaCIS.Core.Infrastructure;
+using MassTransit;
+using System.Linq;
+using System.Text;
+
+namespace IRaCIS.Core.Application.Service.ReadingCalculate
+{
+
+    [ApiExplorerSettings(GroupName = "Reading")]
+    public class IVUSCalculateService(
+        IRepository<ReadingTableQuestionAnswer> _readingTableQuestionAnswerRepository,
+        IRepository<VisitTask> _visitTaskRepository,
+        IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
+        IRepository<ReadingTableQuestionTrial> _readingTableQuestionTrialRepository,
+        IRepository<ReadingTableAnswerRowInfo> _readingTableAnswerRowInfoRepository,
+        IRepository<ReadingQuestionTrial> _readingQuestionTrialRepository,
+        IRepository<OrganInfo> _organInfoRepository,
+        IRepository<ReadingGlobalTaskInfo> _readingGlobalTaskInfoRepository,
+        IRepository<SubjectVisit> _subjectVisitRepository,
+        IRepository<TumorAssessment_IRECIST1Point1> _tumorAssessmentRepository,
+        IGeneralCalculateService _generalCalculateService,
+        IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository,
+        ILogger<IRECIST1Point1CalculateService> _logger) : BaseService, ICriterionCalculateService
+    {
+       
+		/// <summary>
+		/// 获取阅片的计算数据
+		/// </summary>
+		/// <param name="inDto"></param>
+		/// <returns></returns>
+		public async Task<object> GetReadingCalculationData(GetReadingCalculationDataInDto inDto)
+		{
+			return new
+			{
+			};
+		}
+
+		#region 临时对象 单个请求的生命周期 避免重复查询数据库
+
+		private List<VisitTaskAnswerInfo> visitTaskAnswerList;
+
+        /// <summary>
+        /// 获取Sod的值
+        /// </summary>
+        private decimal? sODData;
+
+        /// <summary>
+        /// 获取iSod的值
+        /// </summary>
+        private decimal? iSODData;
+
+        private string nAString = "NA";
+
+        /// <summary>
+        /// 上一次访视Id
+        /// </summary>
+        public Guid? lastVisitTaskId;
+
+        /// <summary>
+        /// 首次转变的任务ID
+        /// </summary>
+        public Guid? firstChangeTaskId;
+
+        /// <summary>
+        /// 触发任务list
+        /// </summary>
+        public List<TirggerTaskInfo>? compareTaskList = null;
+        #endregion
+
+        #region 删除病灶获取起始病灶序号
+        /// <summary>
+        /// 删除病灶获取起始病灶序号（RECIST1Point1 固定是1）
+        /// </summary>
+        /// <returns></returns>
+        public async Task<int> GetDeleteLesionStatrIndex(DeleteReadingRowAnswerInDto inDto)
+        {
+            return 1;
+        }
+        #endregion
+
+        #region 获取阅片报告
+        /// <summary>
+        /// 获取阅片报告
+        /// </summary>
+        /// <param name="indto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<GetReadingReportEvaluationOutDto> GetReadingReportEvaluation(GetReadingReportEvaluationInDto indto)
+        {
+            GetReadingReportEvaluationOutDto result = new GetReadingReportEvaluationOutDto();
+			var isConvertTask = await _visitTaskRepository.Where(x => x.Id == indto.VisitTaskId).Select(x => x.IsConvertedTask).FirstNotNullAsync();
+			var visitTaskInfo = await _visitTaskRepository.Where(x => x.Id == indto.VisitTaskId).FirstNotNullAsync();
+			result.CalculateResult = await this.GetReportVerify(new GetReportVerifyInDto()
+            {
+                VisitTaskId = indto.VisitTaskId,
+                IsConvertTask= isConvertTask,
+				BeforeConvertedTaskId  =visitTaskInfo.BeforeConvertedTaskId,
+			});
+
+
+       
+
+
+          
+
+
+			result.ReadingTaskState = visitTaskInfo.ReadingTaskState;
+            var taskInfoList = await _generalCalculateService.GetReadingReportTaskList(indto.VisitTaskId);
+
+            result.VisitTaskList = taskInfoList;
+
+            var visitTaskIds = taskInfoList.Select(x => x.VisitTaskId).ToList();
+
+            var criterionId = visitTaskInfo.TrialReadingCriterionId;
+            var questionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == criterionId&&x.ShowQuestion!= ShowQuestion.Hide)
+                .WhereIf(isConvertTask,x=>x.ConvertShowType==ConvertShowType.All||x.ConvertShowType==ConvertShowType.AfterShow)
+			    .WhereIf(!isConvertTask, x => x.ConvertShowType == ConvertShowType.All || x.ConvertShowType == ConvertShowType.BeforeShow)
+				.ToListAsync();
+            var tableQuestionList = await _readingTableQuestionTrialRepository.Where(x => x.TrialCriterionId == criterionId).OrderBy(x => x.ShowOrder).ToListAsync();
+			var tableAnsweRowInfos = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == indto.VisitTaskId).ProjectTo<TableAnsweRowInfo>(_mapper.ConfigurationProvider).ToListAsync();
+
+            result.LesionCountList = tableAnsweRowInfos.GroupBy(x => x.LesionType).Select(x => new LesionDto
+            {
+                LesionType = x.Key!.Value,
+                Count = x.ToList().Count()
+            }).ToList();
+
+			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 answers = await _readingTaskQuestionAnswerRepository.Where(x => visitTaskIds.Contains(x.VisitTaskId)).ToListAsync();
+            var tableAnswers = await _readingTableQuestionAnswerRepository.Where(x => visitTaskIds.Contains(x.VisitTaskId)).ToListAsync();
+			var globalanswerList = await _readingGlobalTaskInfoRepository.Where(x => visitTaskIds.Contains(x.TaskId) && x.GlobalVisitTask.TaskState == TaskState.Effect && x.Answer != string.Empty).Select(x => new
+			{
+				x.TaskId,
+				x.GlobalVisitTask.VisitTaskNum,
+				x.QuestionId,
+				x.Answer
+			}).ToListAsync();
+			var alltableAnsweRowInfos = await _readingTableAnswerRowInfoRepository.Where(x => visitTaskIds.Contains(x.VisitTaskId)).ToListAsync();
+            var organIds = alltableAnsweRowInfos.Where(x => x.OrganInfoId != null).Select(x => x.OrganInfoId).Distinct().ToList();
+            var organInfos = await _organInfoRepository.Where(x => organIds.Contains(x.Id)).ToListAsync();
+
+            var needChangeType = new List<QuestionMark?>() {
+                QuestionMark.Organ,
+                QuestionMark.Location,
+                QuestionMark.Part,
+            };
+
+            // 第一级
+
+            #region 构造问题
+            List<ReadingReportDto> questions = questionList.Where(x => x.Type == ReadingQestionType.Group).OrderBy(x => x.ShowOrder).Select(x => new ReadingReportDto()
+            {
+                QuestionId = x.Id,
+                GroupName = x.GroupName,
+                GroupEnName=x.GroupEnName,
+                IsShowInDicom = x.IsShowInDicom,
+                Type = x.Type,
+                GroupId=x.GroupId,
+                QuestionType = x.QuestionType,
+                LesionType = x.LesionType,
+                QuestionGenre = x.QuestionGenre,
+                DataSource = x.DataSource,
+                DictionaryCode = x.DictionaryCode,
+                TypeValue = x.TypeValue,
+                QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
+                ShowOrder = x.ShowOrder,
+                ValueType = x.ValueType,
+                Unit = x.Unit,
+                CustomUnit=x.CustomUnit,
+                ReportLayType= ReportLayType.Group,
+                HighlightAnswer = x.HighlightAnswer,
+                HighlightAnswerList = x.HighlightAnswerList,
+            }).ToList();
+
+            // 分组
+            foreach (var item in questions)
+            {
+                item.Childrens = questionList.Where(x => x.GroupId==item.QuestionId).OrderBy(x => x.ShowOrder).Select(x => new ReadingReportDto()
+                {
+                    GroupName = x.GroupName,
+                    QuestionId = x.Id,
+                    IsShowInDicom = x.IsShowInDicom,
+                    GroupEnName=x.GroupEnName,
+                    QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
+                    LesionType = x.LesionType,
+                    QuestionGenre = x.QuestionGenre,
+                    DataSource = x.DataSource,
+                    DictionaryCode = x.DictionaryCode,
+                    Type = x.Type,
+                    QuestionType = x.QuestionType,
+                    TypeValue = x.TypeValue,
+                    ShowOrder = x.ShowOrder,
+                    OrderMark = x.OrderMark,
+                    ValueType = x.ValueType,
+                    Unit = x.Unit,
+                    CustomUnit=x.CustomUnit,
+                    ReportLayType = ReportLayType.Question,
+                    HighlightAnswer = x.HighlightAnswer,
+                    HighlightAnswerList = x.HighlightAnswerList,
+                }).ToList();
+
+                // 问题
+                foreach (var question in item.Childrens)
+                {
+
+                    foreach (var task in taskInfoList)
+                    {
+						var globalAnswer = globalanswerList.Where(x => x.TaskId == task.VisitTaskId && x.QuestionId == question.QuestionId).OrderByDescending(x => x.VisitTaskNum).FirstOrDefault();
+
+						var answer = answers.Where(x => x.VisitTaskId == task.VisitTaskId && x.ReadingQuestionTrialId == question.QuestionId).FirstOrDefault();
+                        question.Answer.Add(new TaskQuestionAnswer()
+                        {
+                            Answer = answer==null?string.Empty:answer.Answer,
+							IsGlobalChange = globalAnswer == null ? false : true,
+							GlobalChangeAnswer = globalAnswer == null ? string.Empty : globalAnswer.Answer,
+							TaskName = task.TaskName,
+                            VisitTaskId = task.VisitTaskId,
+                             
+                        });
+                    }
+
+                    // 构造表格行数据
+
+
+                    var rowlist = tableAnsweRowInfos.Where(x => x.QuestionId == question.QuestionId).OrderBy(x => x.RowIndex).ToList();
+
+                    question.Childrens = new List<ReadingReportDto>();
+
+                    var rowoindexs = lesionsIndexs.Where(x => x.QuestionId == question.QuestionId).Select(x => x.Rowindexs.OrderBy(y => y).ToList()).FirstOrDefault();
+                    rowoindexs = rowoindexs == null ? new List<decimal>() : rowoindexs;
+                    foreach (var rowoindex in rowoindexs)
+                    {
+                        var rowinfo = rowlist.Where(x => x.RowIndex == rowoindex).FirstOrDefault();
+                        question.Childrens.Add(new ReadingReportDto()
+                        {
+                            QuestionName = question.OrderMark + rowoindex.GetLesionMark(),
+                            RowId = rowinfo?.Id,
+                            IsShowInDicom = question.IsShowInDicom,
+                            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,
+                            ReportMark = rowinfo != null ? rowinfo.ReportMark : string.Empty,
+                         
+                        }) ;
+                    }
+
+
+                    foreach (var row in question.Childrens)
+                    {
+                        // tableQuestion
+                        row.Childrens = tableQuestionList.Where(x => x.ReadingQuestionId == question.QuestionId).Select(x => new ReadingReportDto()
+                        {
+                            QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
+                            QuestionId = x.ReadingQuestionId,
+                            TableQuestionId = x.Id,
+                            Type = x.Type,
+                            LesionType = question.LesionType,
+                            TableQuestionType = x.TableQuestionType,
+                            RowId=row.RowId,
+                            IsShowInDicom = question.IsShowInDicom,
+                            DataSource = x.DataSource,
+                            DictionaryCode = x.DictionaryCode,
+                            QuestionMark = x.QuestionMark,
+                            TypeValue = x.TypeValue,
+                            RowIndex = row.RowIndex,
+                            ShowOrder = x.ShowOrder,
+                            ValueType = x.ValueType,
+                            Unit = x.Unit,
+                            ReportLayType = ReportLayType.TableQuestion,
+                        }).ToList();
+
+
+                        foreach (var tableQuestion in row.Childrens)
+                        {
+                            foreach (var task in taskInfoList)
+                            {
+                                var rowinfo = alltableAnsweRowInfos.Where(x => x.VisitTaskId == task.VisitTaskId && x.QuestionId == tableQuestion.QuestionId && x.RowIndex == tableQuestion.RowIndex).FirstOrDefault();
+                                var taskQuestionAnswer = new TaskQuestionAnswer()
+                                {
+                                    Answer = tableAnswers.Where(x => x.VisitTaskId == task.VisitTaskId && x.QuestionId == tableQuestion.QuestionId && x.RowIndex == tableQuestion.RowIndex && x.TableQuestionId == tableQuestion.TableQuestionId).Select(x => x.Answer).FirstIsNullReturnEmpty(),
+                                    TaskName = task.TaskName,
+                                    VisitTaskId = task.VisitTaskId,
+                                };
+                                if (rowinfo != null && rowinfo.OrganInfoId != null)
+                                {
+                                    var organInfo = organInfos.Where(x => x.Id == rowinfo.OrganInfoId).FirstOrDefault();
+
+
+                                    if (organInfo != null && needChangeType.Contains(tableQuestion.QuestionMark))
+                                    {
+                                        if (_userInfo.IsEn_Us)
+                                        {
+                                            switch (tableQuestion.QuestionMark)
+                                            {
+                                                case QuestionMark.Organ:
+                                                    taskQuestionAnswer.Answer= organInfo.TULOCEN;
+
+                                                    break;
+                                                case QuestionMark.Location:
+                                                    if (organInfo.IsCanEditPosition)
+                                                    {
+                                                       
+                                                    }
+                                                    else
+                                                    {
+                                                        taskQuestionAnswer.Answer = organInfo.TULATEN;
+
+                                                    }
+                                                    break;
+                                                case QuestionMark.Part:
+
+                                                    taskQuestionAnswer.Answer = organInfo.PartEN;
+                                                
+                                                    break;
+
+                                            }
+
+                                        }
+                                        else
+                                        {
+                                            switch (tableQuestion.QuestionMark)
+                                            {
+                                                case QuestionMark.Organ:
+                                                    taskQuestionAnswer.Answer = organInfo.TULOC;
+                                                    break;
+                                                case QuestionMark.Location:
+                                                    if (organInfo.IsCanEditPosition)
+                                                    {
+                                                       
+                                                    }
+                                                    else
+                                                    {
+                                                        taskQuestionAnswer.Answer = organInfo.TULAT;
+
+                                                    }
+                                                    break;
+                                                case QuestionMark.Part:
+                                                    taskQuestionAnswer.Answer = organInfo.Part;
+                                                    break;
+
+                                            }
+                                        }
+
+                                    }
+                                }
+                                tableQuestion.Answer.Add(taskQuestionAnswer);
+                            }
+                        }
+
+
+                    }
+
+
+                };
+            }
+            #endregion
+
+
+
+            result.TaskQuestions = questions;
+
+
+
+            return result;
+
+        }
+        #endregion
+
+        /// <summary>
+        /// 测试计算
+        /// </summary>
+        /// <param name="visitTaskId"></param>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public async Task TestCalculate(Guid visitTaskId, QuestionType? type)
+        {
+            //_logger.LogError("测试计算");
+            ReadingCalculateDto readingData = await _generalCalculateService.GetReadingCalculateDto(visitTaskId);
+            // await _generalCalculateService.LogRecord(readingData, "其他既往新病灶", LesionType.OtherPreviousNewLesion);
+            if (type == null)
+            {
+                await ReadingCalculate(readingData);
+            }
+            else
+
+            {
+                await ReadingCalculate(readingData, new List<QuestionType>() { type.Value });
+            }
+           
+        }
+
+
+
+        /// <summary>
+        /// 计算任务
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task CalculateTask(CalculateTaskInDto inDto)
+        {
+            ReadingCalculateDto readingData = await _generalCalculateService.GetReadingCalculateDto(inDto.VisitTaskId);
+            readingData.IsChangeOtherTask = inDto.IsChangeOtherTask;
+            await ReadingCalculate(readingData);
+        }
+
+        /// <summary>
+        /// 获取报告验证的信息(这里每个标准可能不一样 返回用object)
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        public async Task<GetReportVerifyOutDto> GetReportVerify(GetReportVerifyInDto inDto)
+        {
+			return new GetReportVerifyOutDto()
+            {
+                TumorEvaluate =string.Empty,
+                IsExistDisease = string.Empty,
+
+            };
+        }
+
+
+        /// <summary>
+        /// 自动计算
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <param name="calculateType"></param>
+        /// <returns></returns>
+        public async Task ReadingCalculate(ReadingCalculateDto inDto, List<QuestionType>? calculateType = null)
+        {
+
+            #region 计算  这里顺序非常重要 后面计算的值要依赖前面计算的结果
+            var needAddList = new List<ReadingTaskQuestionAnswer>();
+
+
+            List<ReadingCalculateData> calculateList = new List<ReadingCalculateData>()
+            {
+				////靶病灶径线之和（SOD）
+				//new ReadingCalculateData (){QuestionType=QuestionType.SOD,GetDecimalNullFun=GetSODData},
+            };
+
+            // 没有靶病灶只计算最后几个
+            if (inDto.QuestionInfo.Where(x => x.LesionType == LesionType.TargetLesion).Sum(x => x.TableRowInfoList.Count()) == 0)
+            {
+
+                List<QuestionType> questionTypes = new List<QuestionType>()
+                {
+                    QuestionType.TargetLesion,
+                    QuestionType.NoTargetLesion,
+                    QuestionType.NewLesions,
+                    QuestionType.Tumor,
+                    QuestionType.ExistDisease,
+                };
+
+                // 没有靶病灶就删除其他几个答案的值
+                var isNeedDeleteTypes = calculateList.Where(x => !questionTypes.Contains(x.QuestionType)).Select(x => x.QuestionType).ToList();
+
+
+                var isNeedDeleteIds = inDto.QuestionInfo.Where(x => x.QuestionType != null && isNeedDeleteTypes.Contains(x.QuestionType.Value)).Select(x => x.QuestionId).ToList();
+
+                await _readingTaskQuestionAnswerRepository.BatchUpdateNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId && isNeedDeleteIds.Contains(x.ReadingQuestionTrialId), x => new ReadingTaskQuestionAnswer
+                {
+                    Answer = string.Empty
+                });
+
+
+
+                calculateList = calculateList.Where(x => questionTypes.Contains(x.QuestionType)).ToList();
+
+
+
+
+
+            }
+
+            if (calculateType != null)
+            {
+                calculateList = calculateList.Where(x => calculateType.Contains(x.QuestionType)).ToList();
+            }
+
+            var typeNAList = new List<QuestionType>
+            {
+                QuestionType.SODChange,
+                QuestionType.SODPercent,
+                QuestionType.LowestIncrease,
+                QuestionType.LowPercent,
+            };
+
+            foreach (var calculate in calculateList)
+            {
+                var item = inDto.QuestionInfo.FirstOrDefault(x => x.QuestionType == calculate.QuestionType);
+
+                if (item != null)
+                {
+                    //计算答案  
+                    if (inDto.IsOnlyChangeAllTask == false)
+                    {
+
+                        #region 计算答案
+                        if (calculate.GetDecimalFun != null)
+                        {
+                            item.Answer = (await calculate.GetDecimalFun(inDto)).ToString();
+
+                        }
+                        else if (calculate.GetDecimalNullFun != null)
+                        {
+                            var value = await calculate.GetDecimalNullFun(inDto);
+                            if (value == null)
+                            {
+                                if (typeNAList.Contains(item.QuestionType ?? QuestionType.SOD))
+                                {
+                                    item.Answer = nameof(YesOrNoOrNa.NA);
+
+                                }
+                                else
+                                {
+                                    item.Answer = this.nAString;
+
+                                }
+
+                            }
+                            else
+
+                            {
+                                item.Answer = value == null ? string.Empty : value.Value.ToString();
+                            }
+                        }
+                        else if (calculate.GetStringFun != null)
+                        {
+                            item.Answer = await calculate.GetStringFun(inDto);
+                        }
+                        #endregion
+                        // 修改修约小数位数
+
+                        List<ValueOfType?> valueOfTypes = new List<ValueOfType?>() {
+
+                               ValueOfType.Decimals,
+                               ValueOfType.Percentage
+                            };
+
+                        if (inDto.DigitPlaces != -1)
+                        {
+                            try
+                            {
+
+                                if (valueOfTypes.Contains(item.ValueType))
+                                {
+                                    item.Answer = decimal.Round(decimal.Parse(item.Answer ?? "0"), inDto.DigitPlaces).ToString("F" + inDto.DigitPlaces.ToString());
+                                }
+                            }
+                            catch (Exception)
+                            {
+
+
+                            }
+                        }
+
+
+
+                        needAddList.Add(new ReadingTaskQuestionAnswer()
+                        {
+                            Answer = item.Answer,
+                            ReadingQuestionTrialId = item.QuestionId,
+                        });
+                    }
+
+                    // 修改全局
+                    if (inDto.IsChangeOtherTask && calculate.ChangeAllTaskFun != null)
+                    {
+                        await calculate.ChangeAllTaskFun(new ChangeAllTaskDto()
+                        {
+                            calculateDto = inDto,
+                            QuestionId = item.QuestionId,
+                        });
+                    }
+
+                }
+            }
+
+
+
+            var questionIds = needAddList.Select(x => x.ReadingQuestionTrialId).ToList();
+
+            await _readingTaskQuestionAnswerRepository.BatchDeleteNoTrackingAsync(x => questionIds.Contains(x.ReadingQuestionTrialId) && x.VisitTaskId == inDto.VisitTaskId);
+            needAddList.ForEach(x =>
+            {
+                x.SubjectId = inDto.SubjectId;
+                x.ReadingQuestionCriterionTrialId = inDto.CriterionId;
+                x.VisitTaskId = inDto.VisitTaskId;
+                x.TrialId = inDto.TrialId;
+                x.SubjectId = inDto.SubjectId;
+            });
+
+            await _readingTaskQuestionAnswerRepository.AddRangeAsync(needAddList);
+
+            await _readingTaskQuestionAnswerRepository.SaveChangesAsync();
+            #endregion
+
+
+        }
+
+
+
+
+
+        /// <summary>
+        /// 验证访视提交
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        public async Task VerifyVisitTaskQuestions(VerifyVisitTaskQuestionsInDto inDto)
+        {
+
+        }
+
+        ///// <summary>
+        ///// 计算NTAV的EEM
+        ///// </summary>
+        ///// <param name="inDto"></param>
+        ///// <returns></returns>
+        //public async Task<decimal> GetEEM(ReadingCalculateDto inDto)
+        //{
+        //    var tableQuestion = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.TargetLesion).SelectMany(x => x.TableRowInfoList).ToList();
+        //}
+
+
+        #region 将上一次的访视病灶添加到这一次
+
+        /// <summary>
+        /// 将上一次的访视病灶添加到这一次
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        public async Task<AddTaskLesionAnswerFromLastTaskOutDto> AddTaskLesionAnswerFromLastTask(AddTaskLesionAnswerFromLastTaskInDto inDto)
+        {
+            var visitTaskId = inDto.VisitTaskId;
+
+            var taskinfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).ProjectTo<VisitTaskDto>(_mapper.ConfigurationProvider).FirstNotNullAsync();
+
+            var baseLineVisitId = await _subjectVisitRepository.Where(x => x.SubjectId == taskinfo.SubjectId && x.IsBaseLine).Select(x => x.Id).FirstOrDefaultAsync();
+
+            // 判断当前任务是否是基线
+            if (taskinfo.SourceSubjectVisitId != baseLineVisitId)
+            {
+               
+                // 判断当前任务是是否有表格问题答案
+                if (!(await _readingTableQuestionAnswerRepository.AnyAsync(x => x.VisitTaskId == visitTaskId)))
+                {
+                    if (taskinfo.BeforeConvertedTaskId != null)
+                    {
+                        await _generalCalculateService.AddConvertedTaskFocus(taskinfo.Id, taskinfo.BeforeConvertedTaskId.Value);
+                    }
+                    else
+                    {
+                        var LastVisitTaskId = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&
+                         x.TrialReadingCriterionId == taskinfo.TrialReadingCriterionId &&
+                         x.IsAnalysisCreate == taskinfo.IsAnalysisCreate &&
+                          x.DoctorUserId == taskinfo.DoctorUserId &&
+                          x.IsSelfAnalysis == taskinfo.IsSelfAnalysis &&
+                         x.SubjectId == taskinfo.SubjectId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ArmEnum == taskinfo.ArmEnum
+                         && x.VisitTaskNum < taskinfo.VisitTaskNum && x.TaskState == TaskState.Effect
+                         ).OrderByDescending(x => x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync();
+
+
+
+                        var copyTableAnswers = await _readingTableQuestionAnswerRepository.Where(x => x.VisitTaskId == LastVisitTaskId).Select(x => new CopyTableAnswerDto()
+                        {
+                            Answer = x.Answer,
+                            QuestionId = x.QuestionId,
+                            RowId = x.RowId,
+                            QuestionMark = x.ReadingTableQuestionTrial.QuestionMark,
+                            TableQuestionId = x.TableQuestionId,
+                            RowIndex = x.RowIndex,
+                            TrialId = x.TrialId
+                        }).ToListAsync();
+
+                        var tableRowAnswers = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == LastVisitTaskId).ProjectTo<CopyTableAnswerRowInfo>(_mapper.ConfigurationProvider).ToListAsync();
+
+
+                        tableRowAnswers.ForEach(x =>
+                        {
+                            x.VisitTaskId = visitTaskId;
+                            x.IsCurrentTaskAdd = false;
+                            x.Id = NewId.NextGuid();
+                            x.SeriesId = null;
+                            x.InstanceId = null;
+                            x.MeasureData = string.Empty;
+                            x.PicturePath = string.Empty;
+                        });
+
+                        tableRowAnswers.ForEach(x =>
+                        {
+                            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();
+
+                        });
+
+                        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,
+                            QuestionId = x.QuestionId,
+                            RowIndex = x.RowIndex,
+                            RowId = tableRowAnswers.Where(y => y.OriginalId == x.RowId).Select(x => x.Id).FirstOrDefault(),
+                            TableQuestionId = x.TableQuestionId,
+                            TrialId = x.TrialId,
+                            VisitTaskId = visitTaskId,
+                        });
+
+
+
+
+                        var addList = _mapper.Map<List<ReadingTableAnswerRowInfo>>(tableRowAnswers);
+
+                        await _readingTableAnswerRowInfoRepository.AddRangeAsync(addList);
+                        await _readingTableQuestionAnswerRepository.AddRangeAsync(tableAnswers);
+                        await _readingTableQuestionAnswerRepository.SaveChangesAsync();
+                    }
+                
+
+                }
+            }
+
+            return new AddTaskLesionAnswerFromLastTaskOutDto()
+            {
+
+                IsBaseLine = taskinfo.SourceSubjectVisitId == baseLineVisitId,
+            };
+
+        }
+        #endregion
+
+
+
+    }
+
+}