Uat_Study
parent
48bbefebf9
commit
2e33b5f9ab
|
@ -298,11 +298,13 @@ namespace IRaCIS.Application.Services
|
||||||
{
|
{
|
||||||
if (indto.IsTakeEffect == ReadingPeriodStatus.TakeEffect)
|
if (indto.IsTakeEffect == ReadingPeriodStatus.TakeEffect)
|
||||||
{
|
{
|
||||||
var readingPeriodSet = await _readingPeriodSetRepository.Where(x => x.Id == indto.Id).FirstOrDefaultAsync();
|
|
||||||
|
|
||||||
|
var readingPeriodSet = await _readingPeriodSetRepository.Where(x => x.Id == indto.Id).FirstNotNullAsync();
|
||||||
var plans = _readingPeriodPlanRepository.Where(x => x.ReadingPeriodSetId == indto.Id).Include(x => x.SubjectVisit)
|
var plans = _readingPeriodPlanRepository.Where(x => x.ReadingPeriodSetId == indto.Id).Include(x => x.SubjectVisit)
|
||||||
.Include(x => x.ReadingPeriodSet).Include(x => x.SubjectVisit).ToList();
|
.Include(x => x.ReadingPeriodSet).Include(x => x.SubjectVisit).ToList();
|
||||||
var needAddVisitIds = plans.Select(x => x.SubjectVisitId).ToList();
|
var needAddVisitIds = plans.Select(x => x.SubjectVisitId).ToList();
|
||||||
var repeatVisitNames = _readModuleRepository.Where(x => x.ReadingSetType == ReadingSetType.ImageReading && needAddVisitIds.Contains(x.SubjectVisitId)).Select(x =>x.Subject.Code+"的"+ x.SubjectVisit.VisitName).ToList();
|
var repeatVisitNames = _readModuleRepository.Where(x => x.ReadingSetType == readingPeriodSet.ReadingSetType && needAddVisitIds.Contains(x.SubjectVisitId)).Select(x =>x.Subject.Code+"的"+ x.SubjectVisit.VisitName).ToList();
|
||||||
if(repeatVisitNames.Count!=0)
|
if(repeatVisitNames.Count!=0)
|
||||||
{
|
{
|
||||||
return ResponseOutput.NotOk($"{string.Join(",", repeatVisitNames)}已经添加过阅片期,无法设置生效");
|
return ResponseOutput.NotOk($"{string.Join(",", repeatVisitNames)}已经添加过阅片期,无法设置生效");
|
||||||
|
|
Loading…
Reference in New Issue