XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码修改
continuous-integration/drone/push Build is failing Details

IRC_NewDev
he 2023-12-19 17:24:14 +08:00
parent dd50d9cd12
commit afebbc294b
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
View File

@ -27,6 +27,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
private readonly IRepository<ReadingQuestionTrial> _readingQuestionTrialRepository; private readonly IRepository<ReadingQuestionTrial> _readingQuestionTrialRepository;
private readonly IRepository<OrganInfo> _organInfoRepository; private readonly IRepository<OrganInfo> _organInfoRepository;
private readonly IRepository<SubjectVisit> _subjectVisitRepository; private readonly IRepository<SubjectVisit> _subjectVisitRepository;
private readonly IRepository<DicomStudy> _dicomStudyRepository;
private readonly IRepository<TumorAssessment_RECIST1Point1> _tumorAssessmentRepository; private readonly IRepository<TumorAssessment_RECIST1Point1> _tumorAssessmentRepository;
private readonly ISubjectVisitService _subjectVisitService; private readonly ISubjectVisitService _subjectVisitService;
private readonly IGeneralCalculateService _generalCalculateService; private readonly IGeneralCalculateService _generalCalculateService;
@ -42,6 +43,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
IRepository<ReadingQuestionTrial> readingQuestionTrialRepository, IRepository<ReadingQuestionTrial> readingQuestionTrialRepository,
IRepository<OrganInfo> organInfoRepository, IRepository<OrganInfo> organInfoRepository,
IRepository<SubjectVisit> subjectVisitRepository, IRepository<SubjectVisit> subjectVisitRepository,
IRepository<DicomStudy> dicomStudyRepository,
IRepository<TumorAssessment_RECIST1Point1> tumorAssessmentRepository, IRepository<TumorAssessment_RECIST1Point1> tumorAssessmentRepository,
ISubjectVisitService subjectVisitService, ISubjectVisitService subjectVisitService,
IGeneralCalculateService generalCalculateService, IGeneralCalculateService generalCalculateService,
@ -57,6 +59,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
this._readingQuestionTrialRepository = readingQuestionTrialRepository; this._readingQuestionTrialRepository = readingQuestionTrialRepository;
this._organInfoRepository = organInfoRepository; this._organInfoRepository = organInfoRepository;
this._subjectVisitRepository = subjectVisitRepository; this._subjectVisitRepository = subjectVisitRepository;
this._dicomStudyRepository = dicomStudyRepository;
this._tumorAssessmentRepository = tumorAssessmentRepository; this._tumorAssessmentRepository = tumorAssessmentRepository;
this._subjectVisitService = subjectVisitService; this._subjectVisitService = subjectVisitService;
this._generalCalculateService = generalCalculateService; this._generalCalculateService = generalCalculateService;
@ -2066,7 +2069,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
return FDGPETOverallAssessment.NA.GetEnumInt(); return FDGPETOverallAssessment.NA.GetEnumInt();
} }
var existPET =await GetExistPET(inDto); var existPET = inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.ExistPET && x.Answer == ReadingYesOrNo.Yes.GetEnumInt());
if (existPET.EqEnum(ReadingYesOrNo.No)) if (existPET.EqEnum(ReadingYesOrNo.No))
{ {
return FDGPETOverallAssessment.NE.GetEnumInt(); return FDGPETOverallAssessment.NE.GetEnumInt();
@ -2256,14 +2262,16 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
/// <returns></returns> /// <returns></returns>
public async Task<string> GetExistPET(ReadingCalculateDto inDto) public async Task<string> GetExistPET(ReadingCalculateDto inDto)
{ {
var studyList = await this._subjectVisitService.GetReadingVisitStudyList(new Contracts.GetReadingVisitStudyListIndto() //var studyList = await this._subjectVisitService.GetReadingVisitStudyList(new Contracts.GetReadingVisitStudyListIndto()
{ //{
TrialId = inDto.TrialId, // TrialId = inDto.TrialId,
SujectVisitId = inDto.SubjectVisitId, // SujectVisitId = inDto.SubjectVisitId,
VisitTaskId=inDto.VisitTaskId, // VisitTaskId=inDto.VisitTaskId,
}); //});
return studyList.Any(x => x.Modalities.Contains("PT")) ? ReadingYesOrNo.Yes.GetEnumInt() : ReadingYesOrNo.No.GetEnumInt(); var existPet=await _dicomStudyRepository.Where(x => x.TrialId == inDto.TrialId && x.SubjectVisitId == inDto.SubjectVisitId).AnyAsync(x => x.Modalities.Contains("PT"));
return existPet ? ReadingYesOrNo.Yes.GetEnumInt() : ReadingYesOrNo.No.GetEnumInt();
} }
#region 影像学整体肿瘤评估 #region 影像学整体肿瘤评估