Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

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

@@ -2634,7 +2634,7 @@
             受试者ID
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ChangeCutOffVisitInDto.ModuleName">
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ChangeCutOffVisitInDto.Name">
             <summary>
             模块名称
             </summary>

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

@@ -80,7 +80,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// <summary>
 		/// 模块名称
 		/// </summary>
-		public string ModuleName { get; set; }
+		public string Name { get; set; }
     }
 
     public class GetSubjectReadVisitsInDto

IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs

@@ -82,7 +82,7 @@ namespace IRaCIS.Application.Services
             && x.ReadingTaskState == ReadingTaskState.HaveSigned
             && x.ReadingCategory == ReadingCategory.Visit
             && x.SubjectId == inDto.SubjectId
-            && x.TaskState == TaskState.Effect).MaxAsync(x => x.VisitTaskNum);
+            && x.TaskState == TaskState.Effect).OrderByDescending(x => x.VisitTaskNum).Select(x=> x.VisitTaskNum).FirstOrDefaultAsync();
 
 
             var visitQuery = _subjectVisitRepository.Where(x => x.SubjectId == inDto.SubjectId && x.LatestScanDate != null && !x.IsLostVisit);
@@ -117,7 +117,7 @@ namespace IRaCIS.Application.Services
         {
             await _readModuleRepository.UpdatePartialFromQueryAsync(x => x.Id == inDto.Id, x => new ReadModule() {
             SubjectVisitId=inDto.SubjectVisitIdId,
-            ModuleName=inDto.ModuleName,
+            ModuleName=inDto.Name,
             });
 
             return await _readModuleRepository.SaveChangesAsync();

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

@@ -799,7 +799,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
              && x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.State
             ).Where(x =>
 			  (x.ReadingQuestionTrial.LesionType==LesionType.TargetLesion &&  x.Answer == TargetState.UnableEvaluate.GetEnumInt())
-			|| (x.ReadingQuestionTrial.LesionType == LesionType.NewLesions && x.Answer == NewTargetLesionState.NotEvaluable.GetEnumInt())
+			|| (x.ReadingQuestionTrial.LesionType == LesionType.NewLesions && x.Answer == NewLesionState.UnableEvaluate.GetEnumInt())
 			|| (x.ReadingQuestionTrial.LesionType == LesionType.NonTargetLesions && x.Answer == NoTargetState.UnableEvaluate.GetEnumInt())
 			|| (x.ReadingQuestionTrial.LesionType == LesionType.NewTargetLesion && x.Answer == NewTargetLesionState.NotEvaluable.GetEnumInt())
 			|| (x.ReadingQuestionTrial.LesionType == LesionType.NewNonTargetLesion && x.Answer == NewNoTargetLesionState.NotEvaluable.GetEnumInt())
@@ -1674,7 +1674,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         /// {
         ///     靶病灶疗效为 ICPD
         /// } 
-        /// else if (本次访视满足RECIST1.1的PD条件 && (比整体访视期间最低点SOD增加≥20 % && 比整体访视期间最低点SOD绝对增加值≥5 mm)|| (前一访视评估为iCR && 当前访视至少有一个“存在”状态的靶病灶))
+        /// else if (本次访视满足RECIST1.1的PD条件 && ((比整体访视期间最低点SOD增加≥20 % && 比整体访视期间最低点SOD绝对增加值≥5 mm)|| (前一访视评估为iCR && 当前访视至少有一个“存在”状态的靶病灶)))
         /// {
         ///     靶病灶疗效为 iUPD
         /// } else if (有任一靶病灶为NE状态)
@@ -1777,8 +1777,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 //     靶病灶疗效为 ICPD
                 result = TargetAssessment.iCPD;
             }
-            // } else if (本次访视满足RECIST1.1的PD条件 && (比整体访视期间最低点SOD增加≥20 % && 比整体访视期间最低点SOD绝对增加值≥5 mm)|| (前一访视评估为iCR && 当前访视至少有一个“存在”状态的靶病灶))
+            // } else if (本次访视满足RECIST1.1的PD条件 && ((比整体访视期间最低点SOD增加≥20 % && 比整体访视期间最低点SOD绝对增加值≥5 mm)|| (前一访视评估为iCR && 当前访视至少有一个“存在”状态的靶病灶)))
-            else if (resultData.MeetRECISTPD && (resultData.LowSodAddGreaterThan20Percent && resultData.LowSodAddGreaterThan5) || (resultData.LastTaskTarget.EqEnum(TargetAssessment.iCR) && resultData.HaveExistLesion))
+            else if (resultData.MeetRECISTPD && ((resultData.LowSodAddGreaterThan20Percent && resultData.LowSodAddGreaterThan5) || (resultData.LastTaskTarget.EqEnum(TargetAssessment.iCR) && resultData.HaveExistLesion)))
             {
                 //     靶病灶疗效为 iUPD
                 result = TargetAssessment.iUPD;
@@ -1831,7 +1831,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         /// {
         ///     非靶病灶疗效为 iCPD
         /// }
-        /// else if (任一非靶病灶状态评估为“显著增大（iUPD）”)
+        ///  else if (满足RECIST1.1的PD标准 && 任一非靶病灶状态评估为“显著增大（iUPD）”)
         /// {
         ///     非靶病灶疗效为 iUPD
         /// }
@@ -1917,8 +1917,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 //     非靶病灶疗效为 iCPD
                 result = NoTargetAssessment.iCPD;
             }
-            // else if ( 任一非靶病灶状态评估为“显著增大（iUPD）”)
+            // else if (满足RECIST1.1的PD标准 && 任一非靶病灶状态评估为“显著增大（iUPD）”)
-            else if ( data.ExistiUPD)
+            else if (data.RECISTPD && data.ExistiUPD)
             {
                 //     非靶病灶疗效为 iUPD
                 result = NoTargetAssessment.iUPD;
@@ -2336,7 +2336,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         /// {
         ///     疗效为 iUPD
         /// }
-        /// else if (新靶病灶、新非靶病灶、其它既往新病灶任一项评估为NE)
+        /// else if (新靶病灶、新非靶病灶、其它既往新病灶,触发iRECIST后新病灶 任一项评估为NE)
         /// {
         ///     疗效为 NE
         /// }
@@ -2439,10 +2439,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 //     疗效为 iUPD
                 result = NewLesionAssessment.iUPD;
             }
-            // else if (新靶病灶、新非靶病灶、其它既往新病灶任一项评估为NE)
+            // else if (新靶病灶、新非靶病灶、其它既往新病灶,触发iRECIST后新病灶 任一项评估为NE)
             else if (inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.NewTargetLesion && x.Answer.EqEnum(NewTargetLesionAssessment.NE))
                 || inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.NewNoTargetLesion && x.Answer.EqEnum(NewNoTargetLesionAssessment.NE))
                 || inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.OtherNewTargetLesion && x.Answer.EqEnum(OtherPreviousNewLesionAssessment.NE))
+                || inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.IRECISTNewTargetLesion && x.Answer.EqEnum(NewLesionAfterTriggeringiRECSITAssessment.NE))
                )
              {
                 //     疗效为 NE
@@ -2547,7 +2548,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         /// {
         ///     疗效为 iUPD
         /// }
-        /// else if ((靶病灶评估为iCR && 非靶病灶评估为iCR && 新病灶评估为ND) && (靶病灶评估为ND && 非靶病灶评估为iCR && 新病灶评估为ND) && (靶病灶评估为iCR && 非靶病灶评估为ND && 新病灶评估为ND))
+        /// else if ((靶病灶评估为iCR && 非靶病灶评估为iCR && 新病灶评估为ND)|| (靶病灶评估为ND && 非靶病灶评估为iCR && 新病灶评估为ND) || (靶病灶评估为iCR && 非靶病灶评估为ND && 新病灶评估为ND))
         /// {
         ///     疗效为 iCR
         /// }
@@ -2555,7 +2556,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         /// {
         ///     疗效为 iPR
         /// }
-        /// else if (靶病灶评估为iCR && 非靶病灶评估为iNN或NE && 新病灶评估为否或疑似或NE)
+        /// else if (靶病灶评估为iCR && 非靶病灶评估为iNN或NE && 新病灶评估为ND或疑似或NE)
         /// {
         ///     疗效为 iPR
         /// }
@@ -2616,7 +2617,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
             }
             // else if (上一访视评估为iUPD或iCPD&&靶病灶评估、非靶病灶评估或新病灶评估任一项从前一访视非iUPD结果评估为当前访视iUPD)
-            if (data.LastTaskLesioniUPDOriCPD
+            else if (data.LastTaskLesioniUPDOriCPD
                  && (
                  (
                  lastTaskCalculateDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.TargetLesion && !x.Answer.EqEnum(TargetAssessment.iUPD))
@@ -2647,7 +2648,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 result = OverallAssessment.iUPD;
             }
             // 
-            // else if ((靶病灶评估为iCR && 非靶病灶评估为iCR && 新病灶评估为ND) && (靶病灶评估为ND && 非靶病灶评估为iCR && 新病灶评估为ND) && (靶病灶评估为iCR && 非靶病灶评估为ND && 新病灶评估为ND))
+            // else if ((靶病灶评估为iCR && 非靶病灶评估为iCR && 新病灶评估为ND) || (靶病灶评估为ND && 非靶病灶评估为iCR && 新病灶评估为ND) || (靶病灶评估为iCR && 非靶病灶评估为ND && 新病灶评估为ND))
             else if (
 
                 (inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.TargetLesion && x.Answer.EqEnum(TargetAssessment.iCR))
@@ -2685,7 +2686,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 //     疗效为 iPR
                 result = OverallAssessment.iPR;
             }
-            // else if (靶病灶评估为iCR && 非靶病灶评估为iNN或NE && 新病灶评估为否或疑似或NE)
+            // else if (靶病灶评估为iCR && 非靶病灶评估为iNN或NE && 新病灶评估为ND或疑似或NE)
             else if (inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.TargetLesion && x.Answer.EqEnum(TargetAssessment.iCR))
               && (inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.NoTargetLesion && x.Answer.EqEnum(NoTargetAssessment.iNN))
               || inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.NoTargetLesion && x.Answer.EqEnum(NoTargetAssessment.NE))

IRaCIS.Core.Domain/Reading/View/ReadModuleView.cs

@@ -162,5 +162,10 @@ namespace IRaCIS.Core.Domain.Models
         /// 标准名称
         /// </summary>
         public string CriterionName { get; set; }
+
+        /// <summary>
+        /// 阅片配置的类型
+        /// </summary>
+        public ReadingSetType ReadingSetType { get; set; }
     }
 }