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

IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs

@@ -446,6 +446,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
     }
 
+    public class DeleteTableQuestionMarkInDto
+    {
+        [NotDefault]
+        public Guid RowId { get; set; }
+    }
+
     /// <summary>
     /// 保存表格问题标记
     /// </summary>

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs

@@ -84,6 +84,20 @@ namespace IRaCIS.Core.Application.Service
         }
         #endregion
 
+
+        /// <summary>
+        /// 删除表格问题标记
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<bool> DeleteTableQuestionMark(DeleteTableQuestionMarkInDto inDto)
+        {
+            await _readingTaskQuestionMarkRepository.DeleteFromQueryAsync(x => x.RowId == inDto.RowId);
+            return await _readingTaskQuestionMarkRepository.SaveChangesAsync();
+        }
+
+
         /// <summary>
         /// 保存表格问题标记
         /// </summary>
@@ -142,7 +156,6 @@ namespace IRaCIS.Core.Application.Service
                 var taskInfoList = await _generalCalculateService.GetReadingReportTaskList(rowinfo.VisitTaskId);
                 var visitTaskIds = taskInfoList.Where(x => x.VisitTaskId != rowinfo.VisitTaskId).Select(x => x.VisitTaskId).ToList();
                 result = await _readingTableAnswerRowInfoRepository.Where(x => x.QuestionId == rowinfo.QuestionId && x.RowIndex == rowinfo.RowIndex && visitTaskIds.Contains(x.VisitTaskId))
-
                     .OrderBy(x => x.VisitTask.VisitTaskNum).Select(x => new GetPreviousOtherPicturePathOutDto()
                     {
                         VisitTaskId = x.VisitTaskId,

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

@@ -591,9 +591,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         public async Task<decimal> GetFatFractionAvg(ReadingCalculateDto inDto)
         {
             decimal result = 0;
-            var rowInfo = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.FatFraction).SelectMany(x => x.TableRowInfoList).ToList();
+            var rowInfo = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.FatFraction)
+                .SelectMany(x => x.TableRowInfoList).ToList();
 
-            var tableQuestionList = rowInfo.SelectMany(x => x.TableQuestionList).ToList();
+            var tableQuestionList = rowInfo.Where(x=>x.TableQuestionList.Any(x=>x.QuestionMark== QuestionMark.IsMeasurable&& x.Answer.EqEnum(YesOrNoOrNa.Yes))).SelectMany(x => x.TableQuestionList).ToList();
 
             result = tableQuestionList.Where(x => x.QuestionMark == QuestionMark.AverageValue).Average(x => x.Answer.IsNullOrEmptyReturn0());
             return result;