Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8

IRaCIS.Core.Application/Service/ReadingCalculate/Dto/CriterionCalculateDto.cs

@@ -12,6 +12,16 @@ namespace IRaCIS.Core.Application.ViewModel
         public Guid VisitTaskId { get; set; }
     }
 
+    public class CalculateTargetLesionStatusInDto
+    {
+        public Guid VisitTaskId { get; set;}
+
+        public Guid QuestionId { get; set; }
+
+		public decimal RowNumber { get; set; }
+
+	}
+
 	public class ReadingTaskQuestionAnswerDto : ReadingTaskQuestionAnswer
     {
         public QuestionType QuestionType { get; set; }

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

@@ -404,7 +404,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             if (lowPddTaskid != default(Guid))
             {
 
-                var lowPPDAnswerList = await _readingTableQuestionAnswerRepository.Where(x =>x.VisitTaskId== lowPddTaskid
+                var lowPPDAnswerList = await _readingTableQuestionAnswerRepository.Where(x => x.VisitTaskId == lowPddTaskid
               && x.QuestionId == inDto.QuestionId
              && x.RowIndex == inDto.RowIndex).Include(x => x.ReadingTableQuestionTrial)
                   .Select(x => new
@@ -447,7 +447,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             var calculateDto = await _generalCalculateService.GetReadingCalculateDto(inDto.VisitTaskId);
             return new GetReportVerifyOutDto()
             {
-                TumorEvaluate = calculateDto.QuestionInfo.Where(x=>x.QuestionType==QuestionType.ImgOncology).Select(x=>x.Answer).FirstOrDefault(),
+                TumorEvaluate = calculateDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.ImgOncology).Select(x => x.Answer).FirstOrDefault(),
                 IsExistDisease = await this.GetReportIsExistDisease(inDto.VisitTaskId),
 
             };
@@ -676,7 +676,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                                 if (valueOfTypes.Contains(item.ValueType))
                                 {
-                                    item.Answer = decimal.Round(decimal.Parse(item.Answer ?? "0"), inDto.DigitPlaces).ToString("F"+ inDto.DigitPlaces.ToString());
+                                    item.Answer = decimal.Round(decimal.Parse(item.Answer ?? "0"), inDto.DigitPlaces).ToString("F" + inDto.DigitPlaces.ToString());
                                 }
                             }
                             catch (Exception)
@@ -829,7 +829,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             if (await _readingTaskQuestionAnswerRepository.AnyAsync(x => x.ReadingQuestionTrial.QuestionType == QuestionType.ExistPET && x.VisitTaskId == inDto.VisitTaskId && x.Answer == ReadingYesOrNo.Yes.GetEnumInt()))
             {
 
-                List<QuestionType?> required=new List<QuestionType?>() {
+                List<QuestionType?> required = new List<QuestionType?>() {
                 QuestionType.LiverSUVmax,
                 QuestionType.MediastinumSUVmax,
                 QuestionType.SUVmax,
@@ -866,6 +866,28 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
         }
 
+        /// <summary>
+        /// 计算靶病灶状态
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        public async Task CalculateTargetLesionStatus(CalculateTargetLesionStatusInDto inDto)
+        {
+            if (inDto.RowNumber % 1 != 0)
+            {
+                var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
+
+                // 找到靶病灶问题
+                var targetQuestion = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == taskInfo.TrialReadingCriterionId && x.LesionType == LesionType.TargetLesion).FirstOrDefaultAsync();
+                if(targetQuestion!=null)
+                {
+                    // 找到状态问题
+
+                }
+
+
+			}
+        }
 
 
 		#region 将上一次的访视病灶添加到这一次