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

Browse Source
This commit is contained in:
hang
2025-03-05 15:21:05 +08:00
parent dd33f7e086 055e085d2a
commit 38917e05ab
8 changed files with 19190 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Document/DTO/TrialTrianingRecordViewModel.cs
+1 -1
View File
@@ -44,7 +44,7 @@ public class TrialTrianingRecordAddOrEdit
public int? TrianingCount { get; set; }
public DateOnly TrianingDate { get; set; }
public DateOnly? TrianingDate { get; set; }
public int? TrianingState { get; set; }
}
IRaCIS.Core.Application/Service/Document/TrialNormalRecordService.cs
+1
View File
@@ -33,6 +33,7 @@ public class TrialNormalRecordService(IRepository<TrialNormalRecord> _trialNorma
var trialNormalRecordQueryable = _trialNormalRecordRepository
.Where(x => x.TrialFileTypeId == inDto.TrialFileTypeId)
.WhereIf(inDto.IsAuthorizedView != null, x => x.IsAuthorizedView == inDto.IsAuthorizedView)
.WhereIf(inDto.FileName.IsNotNullOrEmpty(), x => x.TrialFileRecord.FileName.Contains(inDto.FileName))
.ProjectTo<TrialNormalRecordView>(_mapper.ConfigurationProvider);
IRaCIS.Core.Application/Service/Document/TrialTrianingRecordService.cs
+1
View File
@@ -38,6 +38,7 @@ public class TrialTrianingRecordService(IRepository<
var trialTrianingRecordQueryable = _trialTrianingRecordRepository
.Where(x => x.TrialFileTypeId == inDto.TrialFileTypeId)
.WhereIf(inDto.IsAuthorizedView != null, x => x.IsAuthorizedView == inDto.IsAuthorizedView)
.WhereIf(inDto.FileName.IsNotNullOrEmpty(), x => x.TrialFileRecord.FileName.Contains(inDto.FileName))
.WhereIf(inDto.TrianingDateStartTime != null, x => x.TrianingDate >= inDto.TrianingDateStartTime)
.WhereIf(inDto.TrianingDateEndTime != null, x => x.TrianingDate <= inDto.TrianingDateEndTime)
IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs
+1 -1
View File
@@ -63,7 +63,7 @@ namespace IRaCIS.Core.Application.Contracts
}
var list = await noneDicomStudyQueryable.ToListAsync();
var list = await noneDicomStudyQueryable.OrderBy(x => x.ImageDate).ThenBy(x => x.CreateTime).ToListAsync();
var config = await _subjectVisitRepository.Where(t => t.Id == subjectVisitId).Select(t => new { t.Trial.ImageFormatList, t.Trial.StudyNameList ,t.Trial.IsShowStudyName}).FirstOrDefaultAsync();
return ResponseOutput.Ok(list, config) ;