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

Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
hang 2025-11-07 14:41:03 +08:00
parent ca425c602b 44e7ffaeeb
commit e45791c676
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
View File

@ -428,7 +428,8 @@ namespace IRaCIS.Core.Application.Service
}; };
return await _trialDocumentRepository.Where(x => x.TrialId == inDto.TrialId return await _trialDocumentRepository.Where(x => x.TrialId == inDto.TrialId
&& x.TrialDocConfirmedUserList.Any(y => y.ConfirmUserId == _userInfo.UserRoleId && y.ConfirmTime != null) && x.IsPublish
//&& x.TrialDocConfirmedUserList.Any(y => y.ConfirmUserId == _userInfo.UserRoleId && y.ConfirmTime != null)
&& x.NeedConfirmedUserTypeList.Any(y => y.NeedConfirmUserTypeId == _userInfo.UserTypeId)) && x.NeedConfirmedUserTypeList.Any(y => y.NeedConfirmUserTypeId == _userInfo.UserTypeId))
.WhereIf(userType == UserTypeEnum.IndependentReviewer, t => t.FileType.Code == "2" || t.FileType.Code == "6") .WhereIf(userType == UserTypeEnum.IndependentReviewer, t => t.FileType.Code == "2" || t.FileType.Code == "6")
.WhereIf(userType == UserTypeEnum.IQC, t => t.FileType.Code == "4" || t.FileType.Code == "5") .WhereIf(userType == UserTypeEnum.IQC, t => t.FileType.Code == "4" || t.FileType.Code == "5")

13
IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadingPeriodSetService.cs
View File

@ -696,6 +696,19 @@ namespace IRaCIS.Core.Application.Service
SiteIds = inDto.SiteIds, SiteIds = inDto.SiteIds,
}); });
if (await _readingPeriodSetRepository.AnyAsync(x => x.Id != inDto.TrialReadingCriterionId && x.IsTakeEffect != ReadingPeriodStatus.Revocation
&& x.TrialId == inDto.TrialId && x.ReadingPeriodName == inDto.ReadingPeriodName && x.TrialReadingCriterionId == inDto.TrialReadingCriterionId))
{
throw new BusinessValidationFailedException(_localizer["ReadingPeriodSet_NameDup"]);
}
if (inDto.ReadingPeriodName == "Global")
{
throw new BusinessValidationFailedException(_localizer["ReadingPeriodSet_Global"]);
}
List<Guid> isChooseVisitIds = new List<Guid>(); List<Guid> isChooseVisitIds = new List<Guid>();
List<Guid> IsGenerateVisitIds = new List<Guid>(); List<Guid> IsGenerateVisitIds = new List<Guid>();
List<ReadingPeriodPlan> chooseVisitVisitList = new List<ReadingPeriodPlan>(); List<ReadingPeriodPlan> chooseVisitVisitList = new List<ReadingPeriodPlan>();

4
IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
View File

@ -1157,7 +1157,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
var visitIds = siteVisitForTumorList.Select(x => x.SubjectVisitId).ToList(); var visitIds = siteVisitForTumorList.Select(x => x.SubjectVisitId).ToList();
// Dicom 用NM 非dicom 用骨扫描 (BoneScan) // Dicom 用NM 非dicom 用骨扫描 (BoneScan)
List<VisitStudyTime> visitStudies = await _dicomStudyRepository.Where(x => visitIds.Contains(x.SubjectVisitId) && x.ModalityForEdit == "BoneScan").Select(x => new VisitStudyTime() List<VisitStudyTime> visitStudies = await _dicomStudyRepository.Where(x => visitIds.Contains(x.SubjectVisitId) && x.ModalityForEdit == "Bone Scan").Select(x => new VisitStudyTime()
{ {
SubjectVisitId = x.SubjectVisitId, SubjectVisitId = x.SubjectVisitId,
StudyTime = x.StudyTime StudyTime = x.StudyTime
@ -1165,7 +1165,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
}).ToListAsync(); }).ToListAsync();
visitStudies.AddRange( visitStudies.AddRange(
await _noneDicomStudyRepository.Where(x => visitIds.Contains(x.SubjectVisitId) && x.Modality == "BoneScan").Select(x => new VisitStudyTime() await _noneDicomStudyRepository.Where(x => visitIds.Contains(x.SubjectVisitId) && x.Modality == "Bone Scan").Select(x => new VisitStudyTime()
{ {
SubjectVisitId = x.SubjectVisitId, SubjectVisitId = x.SubjectVisitId,
StudyTime = x.ImageDate StudyTime = x.ImageDate