修改

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

@@ -19,7 +19,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         private readonly IRepository<ReadingTableAnswerRowInfo> _readingTableAnswerRowInfoRepository;
         private readonly IRepository<ReadingQuestionTrial> _readingQuestionTrialRepository;
         private readonly IRepository<SubjectVisit> _subjectVisitRepository;
-        private readonly IRepository<TumorAssessment> _tumorAssessmentRepository;
+        private readonly IRepository<TumorAssessment_RECIST1Point1> _tumorAssessmentRepository;
         private readonly IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository;
 
         public GeneralCalculateService(
@@ -30,7 +30,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             IRepository<ReadingTableAnswerRowInfo> readingTableAnswerRowInfoRepository,
             IRepository<ReadingQuestionTrial> readingQuestionTrialRepository,
             IRepository<SubjectVisit> subjectVisitRepository,
-            IRepository<TumorAssessment> tumorAssessmentRepository,
+            IRepository<TumorAssessment_RECIST1Point1> tumorAssessmentRepository,
             IRepository<ReadingTaskQuestionAnswer> readingTaskQuestionAnswerRepository
             )
         {

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

@@ -27,7 +27,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         private readonly IRepository<OrganInfo> _organInfoRepository;
         private readonly IRepository<DicomStudy> _dicomStudyRepository;
         private readonly IRepository<NoneDicomStudy> _noneDicomStudyRepository;
-        private readonly IRepository<TumorAssessment> _tumorAssessmentRepository;
+        private readonly IRepository<TumorAssessment_RECIST1Point1> _tumorAssessmentRepository;
         private readonly IGeneralCalculateService _generalCalculateService;
         private readonly IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository;
 
@@ -42,7 +42,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             IRepository<OrganInfo> organInfoRepository,
             IRepository<DicomStudy> dicomStudyRepository,
             IRepository<NoneDicomStudy> noneDicomStudyRepository,
-            IRepository<TumorAssessment> tumorAssessmentRepository,
+            IRepository<TumorAssessment_RECIST1Point1> tumorAssessmentRepository,
             IGeneralCalculateService generalCalculateService,
             IRepository<ReadingTaskQuestionAnswer> readingTaskQuestionAnswerRepository
             )

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

@@ -26,7 +26,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         private readonly IRepository<ReadingQuestionTrial> _readingQuestionTrialRepository;
         private readonly IRepository<OrganInfo> _organInfoRepository;
         private readonly IRepository<SubjectVisit> _subjectVisitRepository;
-        private readonly IRepository<TumorAssessment> _tumorAssessmentRepository;
+        private readonly IRepository<TumorAssessment_RECIST1Point1> _tumorAssessmentRepository;
         private readonly IGeneralCalculateService _generalCalculateService;
         private readonly IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository;
 
@@ -39,7 +39,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             IRepository<ReadingQuestionTrial> readingQuestionTrialRepository,
             IRepository<OrganInfo> organInfoRepository,
             IRepository<SubjectVisit> subjectVisitRepository,
-            IRepository<TumorAssessment> tumorAssessmentRepository,
+            IRepository<TumorAssessment_RECIST1Point1> tumorAssessmentRepository,
             IGeneralCalculateService generalCalculateService,
             IRepository<ReadingTaskQuestionAnswer> readingTaskQuestionAnswerRepository
             )

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

@@ -26,11 +26,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         private readonly IRepository<ReadingQuestionTrial> _readingQuestionTrialRepository;
         private readonly IRepository<OrganInfo> _organInfoRepository;
         private readonly IRepository<SubjectVisit> _subjectVisitRepository;
-        private readonly IRepository<TumorAssessment> _tumorAssessmentRepository;
+        private readonly IRepository<TumorAssessment_RECIST1Point1> _tumorAssessmentRepository;
         private readonly IGeneralCalculateService _generalCalculateService;
         private readonly IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository;
 
-        public RECIST1Point1CalculateService(
+        public RECIST1Point1_BMCalculateService(
             IRepository<ReadingTableQuestionAnswer> readingTableQuestionAnswerRepository,
             IRepository<VisitTask> visitTaskRepository,
             IRepository<ReadingQuestionCriterionTrial> readingQuestionCriterionTrialRepository,
@@ -39,7 +39,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             IRepository<ReadingQuestionTrial> readingQuestionTrialRepository,
             IRepository<OrganInfo> organInfoRepository,
             IRepository<SubjectVisit> subjectVisitRepository,
-            IRepository<TumorAssessment> tumorAssessmentRepository,
+            IRepository<TumorAssessment_RECIST1Point1> tumorAssessmentRepository,
             IGeneralCalculateService generalCalculateService,
             IRepository<ReadingTaskQuestionAnswer> readingTaskQuestionAnswerRepository
             )

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

@@ -16,7 +16,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         /// </summary>
         Dictionary<CriterionType, Type> CalculateServiceDic = new Dictionary<CriterionType, Type>()
         {
-            {CriterionType.RECIST1Pointt1,typeof(RECIST1Point1CalculateService) }, //RECIST1.1
+            {CriterionType.RECIST1Point1,typeof(RECIST1Point1CalculateService) }, //RECIST1.1
             {CriterionType.PCWG3,typeof(PCWG3CalculateService) },
             {CriterionType.SelfDefine,typeof(SelfDefineCalculateService) }
         };

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

@@ -27,7 +27,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         private readonly IRepository<OrganInfo> _organInfoRepository;
         private readonly IRepository<DicomStudy> _dicomStudyRepository;
         private readonly IRepository<NoneDicomStudy> _noneDicomStudyRepository;
-        private readonly IRepository<TumorAssessment> _tumorAssessmentRepository;
+        private readonly IRepository<TumorAssessment_RECIST1Point1> _tumorAssessmentRepository;
         private readonly IGeneralCalculateService _generalCalculateService;
         private readonly IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository;
 
@@ -42,7 +42,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
               IRepository<OrganInfo> organInfoRepository,
             IRepository<DicomStudy> dicomStudyRepository,
             IRepository<NoneDicomStudy> noneDicomStudyRepository,
-            IRepository<TumorAssessment> tumorAssessmentRepository,
+            IRepository<TumorAssessment_RECIST1Point1> tumorAssessmentRepository,
             IGeneralCalculateService generalCalculateService,
             IRepository<ReadingTaskQuestionAnswer> readingTaskQuestionAnswerRepository
             )