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

修改一版

Browse Source
This commit is contained in:
he
2022-06-02 17:32:18 +08:00
parent 06c87a50da
commit 026e8d29f9
6 changed files with 52 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Reading/Dto/ReadingPeriodSetViewModel.cs
+5 -2
View File
@@ -128,6 +128,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public string ReadingPeriodName { get; set; }
public string SubjectVisitName { get; set; }
}
public class ReadingPeriodSetView
@@ -183,11 +185,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public Guid CreateUserId { get; set; }
public string? SubjectVisitName { get; set; }
/// <summary>
/// 备注
/// 阅片配置的类型
/// </summary>
public string Remark { get; set; } = String.Empty;
public ReadingSetType ReadingSetType { get; set; }
/// <summary>
/// 中心Id
IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs
+15 -12
View File
@@ -176,24 +176,27 @@ namespace IRaCIS.Application.Services
}
/// <summary>
///
/// 添加阅片的时候 获取访视
/// </summary>
/// <param name="inDto"></param>
/// <returns></returns>
//public async Task<List<GetSubjectReadVisitsOutDto>> GetSubjectReadVisits(GetSubjectReadVisitsInDto inDto)
//{
// var visitquery = _subjectVisitRepository.Where(x => x.SubjectId == inDto.SubjectId && x.LatestScanDate != null);
public async Task<List<GetSubjectReadVisitsOutDto>> GetSubjectReadVisits(GetSubjectReadVisitsInDto inDto)
{
var visitquery = _subjectVisitRepository.Where(x => x.SubjectId == inDto.SubjectId && x.LatestScanDate != null);
// var finalVisitNum = await visitquery.Where(x => x.IsFinalVisit).Select(x => x.VisitNum).FirstOrDefaultAsync();
var finalVisitNum = await visitquery.Where(x => x.IsFinalVisit).Select(x => x.VisitNum).FirstOrDefaultAsync();
// var readModulequery = _readModuleRepository.AsQueryable();
// //visitquery = visitquery.WhereIf(finalVisitNum != null, x => x.VisitNum < finalVisitNum)
// // .Where(x => readModulequery.Where(y => y.SubjectVisitId == x.Id && y.ReadingSetType == inDto.ReadingSetType).Count() == 0).OrderBy(x => finalVisitNum)
// // .Select(x=>new GetSubjectReadVisitsOutDto() {
// // } )
//}
var readModulequery = _readModuleRepository.AsQueryable();
return await visitquery.WhereIf(finalVisitNum != null, x => x.VisitNum < finalVisitNum)
.Where(x => readModulequery.Where(y => y.SubjectVisitId == x.Id && y.ReadingSetType == inDto.ReadingSetType).Count() == 0).OrderBy(x => finalVisitNum)
.Select(x => new GetSubjectReadVisitsOutDto()
{
SubjectVisitId = x.Id,
VisitName = x.VisitName,
VisitNum = x.VisitNum,
}).ToListAsync();
}
/// <summary>
/// 添加阅片期
IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs
+1
View File
@@ -109,6 +109,7 @@ namespace IRaCIS.Application.Services
ReadingPeriodSetId=readset.Id,
SubjectCode=x.Subject.Code,
SubjectId=x.SubjectId,
SubjectVisitName=x.VisitName,
//Remark= readset.Remark
}).ToList();
}
IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
+1
View File
@@ -15,6 +15,7 @@ namespace IRaCIS.Core.Application.Service
CreateMap<ReadingPeriodSet, ReadingPeriodSetView>()
.ForMember(d => d.SubjectVisitName, u => u.MapFrom(s => s.VisitStage==null?string.Empty: s.VisitStage.VisitName))
.ForMember(d => d.SiteIds, u => u.MapFrom(s => s.ReadingPeriodSites.Select(x => x.SiteId)))
.ForMember(d => d.SiteCodes, u => u.MapFrom(s => s.ReadingPeriodSites.Select(x => x.TrialSite.TrialSiteCode)));