diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs index 3935427b4..2a7b499f5 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs @@ -15,7 +15,28 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public Guid? SubjectId { get; set; } } + public class GetSubjectReadVisitsOutDto + { + public Guid SubjectVisitId { get; set; } + public decimal VisitNum { get; set; } + + public string VisitName { get; set; } + } + + + public class GetSubjectReadVisitsInDto + { + /// + /// 阅片配置的类型 + /// + public ReadingSetType ReadingSetType { get; set; } + + /// + /// 受试者ID + /// + public Guid SubjectId { get; set; } + } public class ReadModuleAddDto { @@ -45,6 +66,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// 名称 /// public string Name { get; set; } + + /// + /// 阅片配置的类型 + /// + public ReadingSetType ReadingSetType { get; set; } } diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingPeriodSetViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingPeriodSetViewModel.cs index cd9b4e66e..da7228d51 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingPeriodSetViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingPeriodSetViewModel.cs @@ -21,7 +21,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public string ReadingPeriodName { get; set; } - public string Remark { get; set; } /// /// 阅片范围 diff --git a/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs b/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs index 0f60992bc..b4eab63a8 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs @@ -174,6 +174,22 @@ namespace IRaCIS.Application.Services return GetReadModuleOutDto; } + + ///// + ///// + ///// + ///// + ///// + //public async Task> 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 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) + //} /// /// 添加阅片期 @@ -199,11 +215,11 @@ namespace IRaCIS.Application.Services { Id= NewId.NextGuid(), SubjectId = dto.SubjectId, - ModuleType = ModuleTypeEnum.Read, + ModuleType = dto.ReadingSetType==ReadingSetType.ImageReading? ModuleTypeEnum.Read: ModuleTypeEnum.Oncology, IsUrgent = visit.IsUrgent, ModuleName = dto.Name, SubjectVisitId = visit.Id, - ReadingSetType= ReadingSetType.ImageReading, + ReadingSetType= dto.ReadingSetType, Status = ReadingCommon.GetVisitSubmitStateEnum(visit), }); diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs index 6793f513b..add4ae382 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs @@ -109,7 +109,7 @@ namespace IRaCIS.Application.Services ReadingPeriodSetId=readset.Id, SubjectCode=x.Subject.Code, SubjectId=x.SubjectId, - Remark= readset.Remark + //Remark= readset.Remark }).ToList(); } diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriodSet.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriodSet.cs index 25d89cf67..aa4d88555 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingPeriodSet.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingPeriodSet.cs @@ -66,12 +66,6 @@ namespace IRaCIS.Core.Domain.Models /// public ReadingSetType ReadingSetType { get; set; } - /// - /// 备注 - /// - public string Remark { get; set; } = string.Empty; - - public List ReadingPeriodSites { get; set; } = new List(); }