代码修改

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

@@ -1934,6 +1934,13 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.GetExistPET(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
+            <summary>
+            是否存在PET
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.GetImgOncology(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
             <summary>
             影像学整体肿瘤评估

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

@@ -29,6 +29,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         private readonly IRepository<OrganInfo> _organInfoRepository;
         private readonly IRepository<SubjectVisit> _subjectVisitRepository;
         private readonly IRepository<TumorAssessment_RECIST1Point1> _tumorAssessmentRepository;
+        private readonly ISubjectVisitService _subjectVisitService;
         private readonly IGeneralCalculateService _generalCalculateService;
         private readonly IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository;
 
@@ -43,6 +44,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             IRepository<OrganInfo> organInfoRepository,
             IRepository<SubjectVisit> subjectVisitRepository,
             IRepository<TumorAssessment_RECIST1Point1> tumorAssessmentRepository,
+            ISubjectVisitService subjectVisitService,
             IGeneralCalculateService generalCalculateService,
             IRepository<ReadingTaskQuestionAnswer> readingTaskQuestionAnswerRepository
             )
@@ -57,6 +59,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             this._organInfoRepository = organInfoRepository;
             this._subjectVisitRepository = subjectVisitRepository;
             this._tumorAssessmentRepository = tumorAssessmentRepository;
+            this._subjectVisitService = subjectVisitService;
             this._generalCalculateService = generalCalculateService;
             this._readingTaskQuestionAnswerRepository = readingTaskQuestionAnswerRepository;
         }
@@ -502,12 +505,13 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 new ReadingCalculateData (){QuestionType=QuestionType.UptakeChange,GetStringFun=GetUptakeChange},
 
                 // FDG-PET 评估结果
-                 new ReadingCalculateData (){QuestionType=QuestionType.UptakeChange,GetStringFun=GetFDGPETOverallAssessment},
+                 new ReadingCalculateData (){QuestionType=QuestionType.FDGPET,GetStringFun=GetFDGPETOverallAssessment},
 
                  // 影像学整体肿瘤评估
                  new ReadingCalculateData (){QuestionType=QuestionType.ImgOncology,GetStringFun=GetImgOncology},
 
-
+                // 是否存在Pet
+                 new ReadingCalculateData (){QuestionType=QuestionType.ExistPET,GetStringFun=GetExistPET},
                      //SUVmax
                  new ReadingCalculateData (){QuestionType=QuestionType.SUVmax,GetDecimalFun=GetSuvMax},
 
@@ -835,6 +839,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
             var baseLineVisitId = await _subjectVisitRepository.Where(x => x.SubjectId == taskinfo.SubjectId && x.IsBaseLine).Select(x => x.Id).FirstOrDefaultAsync();
 
+
+            ReadingCalculateDto readingData = await _generalCalculateService.GetReadingCalculateDto(visitTaskId);
+            await ReadingCalculate(readingData, new List<QuestionType>() { QuestionType.ExistPET });
+
+
             // 判断当前任务是否是基线
             if (taskinfo.SourceSubjectVisitId != baseLineVisitId)
             {
@@ -2020,6 +2029,23 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         }
         #endregion
 
+        /// <summary>
+        /// 是否存在PET
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        public async Task<string> GetExistPET(ReadingCalculateDto inDto)
+        {
+            var studyList = await this._subjectVisitService.GetReadingVisitStudyList(new Contracts.GetReadingVisitStudyListIndto()
+            {
+                TrialId = inDto.TrialId,
+                SujectVisitId = inDto.SubjectVisitId,
+                VisitTaskId=inDto.VisitTaskId,
+            });
+
+            return studyList.Any(x => x.Modalities.Contains("CT")) ? ReadingYesOrNo.Yes.GetEnumInt() : ReadingYesOrNo.No.GetEnumInt();
+        }
+
         #region 影像学整体肿瘤评估
         /// <summary>
         /// 影像学整体肿瘤评估

IRaCIS.Core.Application/Service/Visit/Interface/ISubjectVisitService.cs

@@ -10,5 +10,7 @@ namespace IRaCIS.Core.Application.Interfaces
         Task<IResponseOutput> SetSVExecuted(Guid subjectVisitId);
 
         Task<IResponseOutput> SetSubjectVisitUrgent(Guid subjectVisitId, bool isUrgent);
+
+        Task<List<VisitStudyDTO>> GetReadingVisitStudyList(GetReadingVisitStudyListIndto indto);
     }
 }