diff --git a/IRaCIS.Core.Application/MassTransit/Consumer/ReadingRelationEmailConsumer.cs b/IRaCIS.Core.Application/MassTransit/Consumer/ReadingRelationEmailConsumer.cs index 43fbe4760..2d152dfae 100644 --- a/IRaCIS.Core.Application/MassTransit/Consumer/ReadingRelationEmailConsumer.cs +++ b/IRaCIS.Core.Application/MassTransit/Consumer/ReadingRelationEmailConsumer.cs @@ -357,7 +357,7 @@ public class UrgentIRApplyedReReadingConsumer( private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue; public async Task Consume(ConsumeContext context) { - Console.WriteLine("发送(024,25) 【加急医学反馈】邮件!!!"); + Console.WriteLine("发送(024,025) 【加急医学反馈】邮件!!!"); var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US; var visitTaskId = context.Message.VisitTaskId; diff --git a/IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs b/IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs index 6a7d53d27..3c57457e8 100644 --- a/IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs +++ b/IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs @@ -301,6 +301,27 @@ namespace IRaCIS.Application.Contracts } + public class BasicInfoAndEmploymentDto: DoctorBasicInfoCommand + { + //部门 + public Guid? DepartmentId { get; set; } = Guid.Empty; + public string DepartmentOther { get; set; } = string.Empty; + public string DepartmentOtherCN { get; set; } = string.Empty; + //职称 + public Guid? RankId { get; set; } = Guid.Empty; + public string RankOther { get; set; } = string.Empty; + public string RankOtherCN { get; set; } = string.Empty; + //职位 主席 副主席 + public Guid? PositionId { get; set; } = Guid.Empty; + public string PositionOther { get; set; } = string.Empty; + public string PositionOtherCN { get; set; } = string.Empty; + + public Guid? HospitalId { get; set; } = Guid.Empty; + + public Guid? PhysicianId { get; set; } + public string Physician { get; set; } = string.Empty; + public string PhysicianCN { get; set; } = string.Empty; + } public class DoctorBasicInfoCommand : DoctorBasicInfo { diff --git a/IRaCIS.Core.Application/Service/Doctor/DoctorService.cs b/IRaCIS.Core.Application/Service/Doctor/DoctorService.cs index 039cf82f2..150823040 100644 --- a/IRaCIS.Core.Application/Service/Doctor/DoctorService.cs +++ b/IRaCIS.Core.Application/Service/Doctor/DoctorService.cs @@ -112,6 +112,19 @@ namespace IRaCIS.Core.Application.Service } + /// + /// 新增修改 医生基本信息和工作 + /// + /// + /// + [HttpPost] + public async Task> AddOrUpdateDoctorBasicInfoAndEmployment(BasicInfoAndEmploymentDto indto) + { + return await AddOrUpdateDoctorBasicInfo(indto); + + + + } /// ///详情、编辑-获取 医生基本信息 BasicInfo