diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 006c367f8..57449316a 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -1146,6 +1146,13 @@ + + + 删除概述 + + + + 获取概述 diff --git a/IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs b/IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs index 15d1d0442..4d97196fc 100644 --- a/IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs +++ b/IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs @@ -369,7 +369,7 @@ namespace IRaCIS.Application.Contracts { public Guid DoctorId { get; set; } - public Guid? TrialId { get; set; } + public Guid? TrialId { get; set; } = null; } public class SummarizeInfoDto diff --git a/IRaCIS.Core.Application/Service/Doctor/DoctorService.cs b/IRaCIS.Core.Application/Service/Doctor/DoctorService.cs index fb0a77071..d74e514a7 100644 --- a/IRaCIS.Core.Application/Service/Doctor/DoctorService.cs +++ b/IRaCIS.Core.Application/Service/Doctor/DoctorService.cs @@ -273,8 +273,7 @@ namespace IRaCIS.Core.Application.Service [HttpPost] public async Task GetSummarizeInfo(GetSummarizeInfoInDto inDto) { - var result = await _doctorSummarizeRepository.Where(t => t.Id == inDto.DoctorId && t.TrialId == inDto.TrialId) - .ProjectTo(_mapper.ConfigurationProvider).ToListAsync(); + if (inDto.TrialId != null) { var doctorInfo = await trialExperienceService.GetTrialDoctorInfo(new GetTrialDoctorInfoInDto() @@ -284,7 +283,8 @@ namespace IRaCIS.Core.Application.Service }); } - + var result = await _doctorSummarizeRepository.Where(t => t.DoctorId == inDto.DoctorId && t.TrialId == inDto.TrialId) + .ProjectTo(_mapper.ConfigurationProvider).ToListAsync(); return new UpdateGneralSituationDto() { SummarizeList= result };