Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -3841,6 +3841,13 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.ReadingCalculateService.GetReportsChartData(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingReportEvaluationInDto)">
+            <summary>
+            获取报表数据
+            </summary>
+            <param name="indto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.ReadingCalculateService.GetReadingReportEvaluation(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingReportEvaluationInDto)">
             <summary>
             获取阅片报告

IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs

@@ -23,8 +23,20 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
           IHttpContextAccessor httpContext,
           IOSSService oSSService,
        IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
-       IStringLocalizer _localizer, IUserInfo _userInfo
+       IStringLocalizer _localizer, IUserInfo _userInfo,
+       IRepository<ReadingTableQuestionAnswer> _readingTableQuestionAnswerRepository,
+        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,
+        IVisitTaskHelpeService _visitTaskHelpeService,
 
+       IMapper _mapper
        ) : BaseService, IReadingCalculateService
     {
         private ICriterionCalculateService _useCriterion;
@@ -375,12 +387,12 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                                         if (item.Childrens.Any(x => x.QuestionMark == QuestionMark.IsLymph && x.Answer[i].Answer.EqEnum(ReadingYesOrNo.Yes)))
                                         {
                                             chartData.Value.Add(item.Childrens.Where(x => x.QuestionMark == QuestionMark.ShortAxis).Select(x => x.Answer[i].Answer).FirstOrDefault());
-                                            result.Unit = item.Childrens.Where(x => x.QuestionMark == QuestionMark.ShortAxis).Select(x => x.Unit).FirstOrDefault();
+                                            result.Unit = item.Childrens.Where(x => x.QuestionMark == QuestionMark.MajorAxis).Select(x => x.Unit).FirstOrDefault();
                                         }
                                         else
                                         {
                                             chartData.Value.Add(item.Childrens.Where(x => x.QuestionMark == QuestionMark.MajorAxis).Select(x => x.Answer[i].Answer).FirstOrDefault());
-                                            result.Unit = item.Childrens.Where(x => x.QuestionMark == QuestionMark.ShortAxis).Select(x => x.Unit).FirstOrDefault();
+                                            result.Unit = item.Childrens.Where(x => x.QuestionMark == QuestionMark.MajorAxis).Select(x => x.Unit).FirstOrDefault();
                                         }
                                         break;
 
@@ -469,7 +481,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 ).OrderByDescending(x => x.VisitTaskNum).FirstOrDefaultAsync();
                 if (task != null)
                 {
-                    data = await GetReadingReportEvaluation(new GetReadingReportEvaluationInDto()
+                    data = await GetReportsChartData(new GetReadingReportEvaluationInDto()
                     {
                         TrialId = task.TrialId,
                         VisitTaskId = task.Id,
@@ -486,11 +498,23 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     Evaluation = new List<List<EvaluationValue>>() { }
                 };
 
+                var baseLineAnswerType= QuestionType.ExistDisease;
+
                 var visitAnswerType = QuestionType.Tumor;
-                if (criterion.CriterionType == CriterionType.PCWG3)
+                switch (criterion.CriterionType)
                 {
-                    visitAnswerType = QuestionType.SiteVisitForTumorEvaluation;
+                    case CriterionType.PCWG3:
+                        baseLineAnswerType= QuestionType.SiteVisitForTumorEvaluation;
+                        visitAnswerType = QuestionType.SiteVisitForTumorEvaluation;
+                        break;
+                    case CriterionType.Lugano2014WithoutPET:
+                        visitAnswerType = QuestionType.CTandMRI;
+                        break;
+                    case CriterionType.Lugano2014:
+                        visitAnswerType = QuestionType.ImgOncology;
+                        break;
                 }
+                
 
 
                 result.Evaluation.Add(visitTaskName.Select(x=> new EvaluationValue() { 
@@ -499,7 +523,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                 var r1baseLine= r1.TaskQuestions
                              .SelectMany(x => x.Childrens)
-                             .Where(x => x.QuestionType == QuestionType.ExistDisease)
+                             .Where(x => x.QuestionType == baseLineAnswerType)
                              .SelectMany(x => x.Answer.Select(a => new EvaluationValue
                              {
                                  DictionaryCode = x.DictionaryCode,
@@ -530,7 +554,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 {
                     var r2baseLine = r2.TaskQuestions
                           .SelectMany(x => x.Childrens)
-                          .Where(x => x.QuestionType == QuestionType.ExistDisease)
+                          .Where(x => x.QuestionType == baseLineAnswerType)
                           .SelectMany(x => x.Answer.Select(a => new EvaluationValue
                           {
                               DictionaryCode = x.DictionaryCode,
@@ -582,10 +606,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                         };
                         if (negativeToString.Contains(item.QuestionType))
                         {
-                            cd.Value.ForEach(item1 =>
+                            cd.Value = cd.Value.Select(item => item == "-1"|| item == "-2" ? string.Empty : item).ToList();
-                            {
-                                item1 = item1 == "-1" ? string.Empty : item1;
-                            });
                         }
                         chartList.Add(cd);
                     }
@@ -654,6 +675,102 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
         }
 
+
+        /// <summary>
+        /// 获取报表数据
+        /// </summary>
+        /// <param name="indto"></param>
+        /// <returns></returns>
+        private async Task<GetReadingReportEvaluationOutDto> GetReportsChartData(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)
+                .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 Globalanswer()
+            {
+                TaskId = x.TaskId,
+                VisitTaskNum = x.GlobalVisitTask.VisitTaskNum,
+                QuestionId = x.QuestionId,
+                Answer = 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,
+            };
+
+            // 第一级
+
+            List<ReadingReportDto> questions = await _generalCalculateService.GetReadingReportQuestion
+           (
+            questionList,
+            taskInfoList,
+           globalanswerList,
+            answers,
+            tableAnsweRowInfos,
+             tableQuestionList,
+             alltableAnsweRowInfos,
+             tableAnswers,
+            organInfos,
+             needChangeType
+           );
+
+
+
+            result.TaskQuestions = questions;
+
+
+
+            return result;
+
+        }
+
         /// <summary>
         /// 获取阅片报告
         /// </summary>