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

修改
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
he 2025-11-04 16:08:57 +08:00
parent f347b34f59
commit 8f34644d45
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/Reading/Dto/ReadingPeriodSetViewModel.cs
View File

@ -144,7 +144,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public class PreviewTheReadingListInDto : PageInput public class PreviewTheReadingListInDto : PageInput
{ {
public Guid? Id { get; set; } public Guid? ReadingPeriodSetId { get; set; }
/// <summary> /// <summary>
/// 阅片范围 /// 阅片范围

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

@ -680,7 +680,7 @@ namespace IRaCIS.Core.Application.Service
// 这里还需要获取到之前已经添加的 // 这里还需要获取到之前已经添加的
var isChangeReadingPlan = await IsChangeReadingPlan(new IsChangeReadingPlanInDto() var isChangeReadingPlan = await IsChangeReadingPlan(new IsChangeReadingPlanInDto()
{ {
Id = inDto.Id, Id = inDto.ReadingPeriodSetId,
ExpirationDate = inDto.ExpirationDate, ExpirationDate = inDto.ExpirationDate,
ReadingScope = inDto.ReadingScope, ReadingScope = inDto.ReadingScope,
TrialId = inDto.TrialId, TrialId = inDto.TrialId,
@ -698,9 +698,9 @@ namespace IRaCIS.Core.Application.Service
List<ReadModule> readModules = new List<ReadModule>(); List<ReadModule> readModules = new List<ReadModule>();
if (!isChangeReadingPlan) if (!isChangeReadingPlan)
{ {
if (inDto.Id != null) if (inDto.ReadingPeriodSetId != null)
{ {
readModules = await _readModuleRepository.Where(x => x.ReadingPeriodSetId == inDto.Id).ToListAsync(); readModules = await _readModuleRepository.Where(x => x.ReadingPeriodSetId == inDto.ReadingPeriodSetId).ToListAsync();
var readModuleIds= readModules.Select(x => x.Id).ToList(); var readModuleIds= readModules.Select(x => x.Id).ToList();
@ -709,12 +709,12 @@ namespace IRaCIS.Core.Application.Service
isGenerateTaskVisitIds = await _readModuleRepository.Where(x => souceReadModuleIds.Contains(x.Id)&&x.ReadingPeriodPlanId!=null).Select(x=>x.SubjectVisitId).ToListAsync(); isGenerateTaskVisitIds = await _readModuleRepository.Where(x => souceReadModuleIds.Contains(x.Id)&&x.ReadingPeriodPlanId!=null).Select(x=>x.SubjectVisitId).ToListAsync();
} }
chooseVisitVisitList = await _readingPeriodPlanRepository.Where(x => x.ReadingPeriodSetId == inDto.Id).ToListAsync(); chooseVisitVisitList = await _readingPeriodPlanRepository.Where(x => x.ReadingPeriodSetId == inDto.ReadingPeriodSetId).ToListAsync();
isChooseVisitIds= chooseVisitVisitList.Select(x => x.SubjectVisitId).ToList(); isChooseVisitIds= chooseVisitVisitList.Select(x => x.SubjectVisitId).ToList();
IsGenerateVisitIds= chooseVisitVisitList.Where(x => x.IsGenerate).Select(x => x.SubjectVisitId).ToList(); IsGenerateVisitIds= chooseVisitVisitList.Where(x => x.IsGenerate).Select(x => x.SubjectVisitId).ToList();
} }
var isTakeEffect = await _readingPeriodSetRepository.Where(x => x.Id == inDto.Id).Select(x => x.IsTakeEffect).FirstOrDefaultAsync(); var isTakeEffect = await _readingPeriodSetRepository.Where(x => x.Id == inDto.ReadingPeriodSetId).Select(x => x.IsTakeEffect).FirstOrDefaultAsync();
var readModulequery = _readModuleRepository.AsQueryable(); var readModulequery = _readModuleRepository.AsQueryable();
// 当前项目 最晚拍片日期不为null 中心筛选 // 当前项目 最晚拍片日期不为null 中心筛选
@ -792,7 +792,7 @@ namespace IRaCIS.Core.Application.Service
TotalCount = totalCount, TotalCount = totalCount,
}; };
return (result,new { return (result,new {
NeedReminder=inDto.Id==null, NeedReminder=inDto.ReadingPeriodSetId == null,
}); });
} }