From 6c434e2ace73291c68434128f31bbd062de4cbd3 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Thu, 21 Nov 2024 13:32:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/IRaCIS.Core.Application.xml | 7 +++++++ IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs | 2 +- IRaCIS.Core.Application/Service/Doctor/DoctorService.cs | 6 +++--- 3 files changed, 11 insertions(+), 4 deletions(-) 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 };