修改

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

@@ -2046,6 +2046,7 @@ namespace IRaCIS.Application.Services
             return ResponseOutput.Ok(true);
         }
 
+     
 
         /// <summary>
 		/// 验证访视提交
@@ -2057,6 +2058,16 @@ namespace IRaCIS.Application.Services
         {
             await VerifyTaskIsSign(inDto.VisitTaskId);
             await VerifyDefaultQuestionBeAnswer(inDto);
+
+            // 转化后的任务不应该有新病灶
+
+            var isConvertedTask = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Select(x=>x.IsConvertedTask).FirstNotNullAsync();
+
+            if (await _readingTableAnswerRowInfoRepository.AnyAsync(x => x.ReadingQuestionTrial.LesionType == LesionType.NewLesions && x.VisitTaskId == inDto.VisitTaskId))
+            {
+                throw new BusinessValidationFailedException(_localizer["ReadingImage_NotNewFocus"]);
+            }
+
             var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
             var isBaseline = await _subjectVisitRepository.Where(x => x.Id == taskInfo.SourceSubjectVisitId).Select(x => x.IsBaseLine).FirstOrDefaultAsync();
             var readingQuestionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == taskInfo.TrialReadingCriterionId

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

@@ -1574,6 +1574,41 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         #endregion
 
 
+
+        public async Task<string> GetNewTargetLesionEvaluate(ReadingCalculateDto inDto)
+        {
+            var tableQuestion = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.NewTargetLesion).SelectMany(x => x.TableRowInfoList).ToList();
+            if (inDto.IsBaseLine)
+            {
+                return TargetAssessment.NA.GetEnumInt();
+            }
+
+            IRECISTNewTargetLesionDto resultData = new IRECISTNewTargetLesionDto()
+            {
+                // 是否存在新靶病灶
+                ExistsNewTargetLesion = tableQuestion.Count() > 0,
+
+                // 所有状态为消失
+                AllVanish = false,
+
+                // 上一访视新靶病灶评估为“iUPD”
+                LastTaskIsiUPD = true,
+
+                //SOD增加5mm以上
+                ISODAdd5mm = true,
+
+                //有"存在"状态的新靶病灶
+                HaveExixtsState = true,
+
+                // 至少有一个新靶病无法评估
+                ExixtsUnevaluableState = true,
+
+            };
+
+            return string.Empty;
+        }
+
+
         #region 获取靶病灶评估
         /// <summary>
         /// 获取靶病灶评估