修改

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

@@ -1201,6 +1201,11 @@
             上一次访视Id
             </summary>
         </member>
+        <member name="F:IRaCIS.Core.Application.Service.ReadingCalculate.IRECIST1Point1CalculateService.firstChangeTaskId">
+            <summary>
+            首次转变的任务ID
+            </summary>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.IRECIST1Point1CalculateService.GetDeleteLesionStatrIndex(IRaCIS.Core.Application.Service.Reading.Dto.DeleteReadingRowAnswerInDto)">
             <summary>
             删除病灶获取起始病灶序号（RECIST1Point1 固定是1）
@@ -1368,7 +1373,7 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.IRECIST1Point1CalculateService.GetLastTaskSODChange(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.IRECIST1Point1CalculateService.GetComparedTriggeringSODChange(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
             <summary>
             与前一访视SOD相比变化量
             </summary>
@@ -1382,9 +1387,9 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.IRECIST1Point1CalculateService.GetISODChange(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.IRECIST1Point1CalculateService.GetComparedTriggeringiSODChange(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
             <summary>
-             与前一访视相比iSOD变化量
+             与触发iRECIST访视相比iSOD变化量
             </summary>
             <param name="inDto"></param>
             <returns></returns>
@@ -7474,6 +7479,11 @@
             与基线期SOD相比减小≥30 %
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.IRECISTTargetLesionDto.NoTargetLymphLoss">
+            <summary>
+            非靶病灶中淋巴结病灶全部消失
+            </summary>
+        </member>
         <member name="T:IRaCIS.Core.Application.ViewModel.IRECISTNoTargetLesion">
             <summary>
             IRECIST 非靶病灶
@@ -7554,6 +7564,16 @@
             至少有一个新靶病无法评估
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.IRECISTNewTargetLesionDto.ExixtsLymphTarget">
+            <summary>
+            当有“存在”状态的淋巴结新靶病灶
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.IRECISTNewTargetLesionDto.ExixtsOrLessNoLymphTarget">
+            <summary>
+            当有“存在”或“太小”状态的非淋巴结新靶病灶
+            </summary>
+        </member>
         <member name="T:IRaCIS.Core.Application.ViewModel.IRECISTOtherNewTargetLesionDto">
             <summary>
             其他既往新病灶

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

@@ -78,6 +78,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         /// 上一次访视Id
         /// </summary>
         public Guid? lastVisitTaskId;
+
+        /// <summary>
+        /// 首次转变的任务ID
+        /// </summary>
+        public Guid? firstChangeTaskId;
         #endregion
 
         #region 删除病灶获取起始病灶序号
@@ -484,8 +489,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 			    //被评估为NE的单个靶病灶
 			    new ReadingCalculateData (){QuestionType=QuestionType.NETarget,GetStringFun=GetNETarget},
 
-                 // 与前一访视SOD相比变化量
-                 new ReadingCalculateData (){QuestionType=QuestionType.LastVisitSODChange,GetDecimalNullFun=GetLastTaskSODChange,IsConvertedTask=true},
+                 // 与触发iRECIST访视相比SOD变化量
+                 new ReadingCalculateData (){QuestionType=QuestionType.ComparedTriggeringSODChange,GetDecimalNullFun=GetComparedTriggeringSODChange,IsConvertedTask=true},
 
                  // 新靶病灶直径之和（iSOD）
                  new ReadingCalculateData (){QuestionType=QuestionType.ISOD,GetDecimalNullFun=GetiSODData,IsConvertedTask=true},
@@ -579,6 +584,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 {
                     QuestionType.ISOD,
                     QuestionType.ComparedTriggeringiSODChange,
+                    QuestionType.ComparedTriggeringSODChange,
                     QuestionType.TargetLesion,
                     QuestionType.NoTargetLesion,
                     QuestionType.NewLesions,
@@ -1321,7 +1327,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         /// </summary>
         /// <param name="inDto"></param>
         /// <returns></returns>
-        public async Task<decimal?> GetLastTaskSODChange(ReadingCalculateDto inDto)
+        public async Task<decimal?> GetComparedTriggeringSODChange(ReadingCalculateDto inDto)
         {
             var lastTaskId = await this.GetLastVisitTaskId(inDto);
             var lastSOD = (await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == lastTaskId && x.ReadingQuestionTrial.QuestionType == QuestionType.SOD).Select(x => x.Answer).FirstOrDefaultAsync()).IsNullOrEmptyReturn0();
@@ -1658,8 +1664,14 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         private async Task<Guid> GetFirstChangeTaskId(ReadingCalculateDto inDto)
         {
 
+            if (firstChangeTaskId != null)
+            {
+                return firstChangeTaskId.Value;
+            }
+            else
+            {
                 var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).ProjectTo<VisitTaskDto>(_mapper.ConfigurationProvider).FirstNotNullAsync();
-            var firstChangeTaskId = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&
+                var taskId = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&
                      x.TrialReadingCriterionId == taskinfo.TrialReadingCriterionId &&
                      x.IsAnalysisCreate == taskinfo.IsAnalysisCreate &&
                       x.DoctorUserId == taskinfo.DoctorUserId &&
@@ -1667,8 +1679,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                      x.SubjectId == taskinfo.SubjectId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ArmEnum == taskinfo.ArmEnum
                      && x.BeforeConvertedTaskId != null && x.TaskState == TaskState.Effect
                      ).OrderBy(x => x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync();
+                firstChangeTaskId = taskId;
+                return taskId;
+            }
            
-            return firstChangeTaskId;
 
         }
         #endregion
@@ -1723,7 +1737,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             var tableQuestion = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.TargetLesion).SelectMany(x => x.TableRowInfoList).ToList();
             var lastVisitTaskId = await GetLastVisitTaskId(inDto);
             var targetLesionQuestionId = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.TargetLesion).Select(x => x.QuestionId).FirstOrDefault();
-
+            var firstChangeTaskId = await GetFirstChangeTaskId(inDto);
             var sodQuestionId = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.SOD).Select(x => x.QuestionId).FirstOrDefault();
             IRECISTTargetLesionDto resultData = new IRECISTTargetLesionDto()
             {
@@ -1738,7 +1752,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 MeetRECISTPD = (await GetTargetLesionEvaluate(inDto)) == TargetAssessment.PD.GetEnumInt(),
 
                 // 本次访视SOD与触发iRECIST访视相比本次访视SOD增加不小于5mm
-                SODTiggerAddGreaterThan5 = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.ComparedTriggeringiSODChange).Sum(x => x.Answer.IsNullOrEmptyReturn0()) >= 5,
+                SODTiggerAddGreaterThan5 = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.ComparedTriggeringSODChange).Sum(x => x.Answer.IsNullOrEmptyReturn0()) >= 5,
+
 
                 //比整体访视期间最低点SOD增加≥20 %
                 LowSodAddGreaterThan20Percent = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.LowPercent).Sum(x => x.Answer.IsNullOrEmptyReturn0()) >= 20,
@@ -1991,7 +2006,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         /// {
         ///    疗效为 ND
         /// }
-        /// else if (上一访视新靶病灶评估为“iUPD” && 满足iSOD增加5mm)
+        /// else if (上一访视新靶病灶评估为“iUPD” && 与触发iRECIS任务iSod增加大于5mm)
         /// {
         ///    疗效为 iCPD
         /// }
@@ -2032,9 +2047,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 LastTaskNewTargetLesion = (await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == lastVisitTaskId && x.ReadingQuestionTrialId == newTargetLesionQuestionId)
                 .Select(x => x.Answer).FirstOrDefaultAsync()) ?? string.Empty,
 
-                //SOD增加5mm以上
-                ISODAdd5mm = await GetiSODData(inDto) - (await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == lastVisitTaskId && x.ReadingQuestionTrialId == isodQuestionId)
-                .Select(x => x.Answer).FirstOrDefaultAsync()).IsNullOrEmptyReturn0() >= 5,
+                //与触发iRECIS任务iSod增加大于5mm
+                ISODAdd5mm  = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.ComparedTriggeringiSODChange).Sum(x => x.Answer.IsNullOrEmptyReturn0()) >= 5,
 
                 //有"存在"状态的新靶病灶
                 HaveExixtsState = tableQuestion.SelectMany(x => x.TableQuestionList).Any(x => x.QuestionMark == QuestionMark.State && x.Answer.EqEnum(NewTargetLesionState.Exist)),
@@ -2084,7 +2098,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 //    疗效为 ND
                 result = NewTargetLesionAssessment.ND;
              }
-            // else if (上一访视新靶病灶评估为“iUPD” && 满足iSOD增加5mm)
+            // else if (上一访视新靶病灶评估为“iUPD” && 与触发iRECIS任务iSod增加大于5mm)
             else if (data.LastTaskNewTargetLesion.EqEnum(NewTargetLesionAssessment.iUPD)&&data.ISODAdd5mm)
              {
                 //    疗效为 iCPD

IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs

@@ -1466,7 +1466,7 @@ namespace IRaCIS.Core.Domain.Share
         /// <summary>
         /// 与前一访视SOD相比变化量
         /// </summary>
-        LastVisitSODChange = 23,
+        ComparedTriggeringSODChange = 23,
 
         /// <summary>
         /// 新靶病灶直径之和（iSOD）