From b5f12cd3b44b5d462e8ae30ef60b5dfc05d04298 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Mon, 21 Oct 2024 14:35:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Reading/ReadingImageTask/ReadingImageTaskService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 0ff36e8bf..7d082c2c3 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -782,7 +782,7 @@ namespace IRaCIS.Core.Application.Service var criterionIdInfo = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == trialReadingCriterionId).FirstNotNullAsync(); - var groupIds = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == trialReadingCriterionId && x.Type == ReadingQestionType.Table || x.Type == ReadingQestionType.BasicTable).Select(x => x.GroupId).Distinct().ToListAsync(); + var groupIds = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == trialReadingCriterionId &&( x.Type == ReadingQestionType.Table || x.Type == ReadingQestionType.BasicTable)).Select(x => x.GroupId).Distinct().ToListAsync(); var questionIds = await _readingQuestionTrialRepository .Where(x => x.IsShowInDicom) From 8ec37f43372899c769a98d596904939ee882b888 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Mon, 21 Oct 2024 14:49:30 +0800 Subject: [PATCH 2/3] =?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.API/IRaCIS.Core.API.xml | 7 ++----- .../ReadingCalculate/General/ReadingCalculateService.cs | 5 ++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.xml b/IRaCIS.Core.API/IRaCIS.Core.API.xml index 216f82c9a..4b4186d94 100644 --- a/IRaCIS.Core.API/IRaCIS.Core.API.xml +++ b/IRaCIS.Core.API/IRaCIS.Core.API.xml @@ -340,13 +340,10 @@ 序列化，反序列化的时候，处理时间 时区转换 - + - 创建属性 + LowerCamelCaseJsonAttribute 可以设置类小写返回给前端 - 类型 - 序列化成员 - diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs index 54282f80d..688854f61 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs @@ -14,12 +14,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate public class ReadingCalculateService(IEnumerable _criterionServices, IRepository _visitTaskRepository, IRepository _readingQuestionCriterionTrialRepository, - ICriterionCalculateService _useCriterion, - IStringLocalizer _localizer, IUserInfo _userInfo + IStringLocalizer _localizer, IUserInfo _userInfo ) : BaseService, IReadingCalculateService { - + private ICriterionCalculateService _useCriterion; /// /// 标准和服务对应 /// From 80f05c2b74aa5ce0858c6963c84c50365ef9f81e Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Mon, 21 Oct 2024 15:28:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Consumer/ReadingRelationEmailConsumer.cs | 21 ++++++++++++------- .../Service/Doctor/DTO/DoctorModel.cs | 10 +++++++++ 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/IRaCIS.Core.Application/MassTransit/Consumer/ReadingRelationEmailConsumer.cs b/IRaCIS.Core.Application/MassTransit/Consumer/ReadingRelationEmailConsumer.cs index 2d152dfae..0338bd1f5 100644 --- a/IRaCIS.Core.Application/MassTransit/Consumer/ReadingRelationEmailConsumer.cs +++ b/IRaCIS.Core.Application/MassTransit/Consumer/ReadingRelationEmailConsumer.cs @@ -12,6 +12,7 @@ using System; using System.Collections.Generic; using System.Globalization; using System.Linq; +using System.Reactive.Subjects; using System.Text; using System.Threading.Tasks; @@ -96,13 +97,14 @@ public class UrgentMedicalReviewAddedEventConsumer( Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input => { - var topicStr = string.Format(input.topicStr, companyName, trialInfo.ResearchProgramNo); + var subjectName = taskInfo.BlindSubjectCode.IsNullOrEmpty() ? taskInfo.Subject.Code : taskInfo.BlindSubjectCode; + var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo, subjectName, taskInfo.TaskBlindName); var htmlBodyStr = string.Format( CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr), userinfo.FullName, // 用户名 {0} trialInfo.ExperimentName, // 项目 {1} criterion.CriterionName, // 阅片标准 {2} - taskInfo.BlindSubjectCode.IsNullOrEmpty() ? taskInfo.Subject.Code : taskInfo.BlindSubjectCode, // 受试者 {3} + subjectName, // 受试者 {3} taskInfo.TaskBlindName, // 访视 {4} dictionValue[0], // 任务类型 {5} //dictionValue[1], // 阅片人是否同意 {6} @@ -196,13 +198,14 @@ public class UrgentIRRepliedMedicalReviewConsumer( Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input => { - var topicStr = string.Format(input.topicStr, companyName, trialInfo.ResearchProgramNo); + var subjectCode = taskInfo.BlindSubjectCode.IsNullOrEmpty() ? taskInfo.Subject.Code : taskInfo.BlindSubjectCode; + var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo, subjectCode, taskInfo.TaskBlindName); var htmlBodyStr = string.Format( CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr), userinfo.FullName, // 用户名 {0} trialInfo.ExperimentName, // 项目 {1} criterion.CriterionName, // 阅片标准 {2} - taskInfo.BlindSubjectCode.IsNullOrEmpty() ? taskInfo.Subject.Code : taskInfo.BlindSubjectCode, // 受试者 {3} + subjectCode, // 受试者 {3} taskInfo.TaskBlindName, // 访视 {4} dictionValue[0], // 任务类型 {5} dictionValue[1], // 阅片人是否同意 {6} @@ -309,12 +312,13 @@ public class UrgentMIMRepliedMedicalReviewConsumer( Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input => { - var topicStr = string.Format(input.topicStr, companyName, trialInfo.ResearchProgramNo); + var subjectCode = taskInfo.BlindSubjectCode.IsNullOrEmpty() ? taskInfo.Subject.Code : taskInfo.BlindSubjectCode; + var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo, subjectCode, taskInfo.TaskBlindName); var htmlBodyStr = string.Format( CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr), userinfo.FullName, // 用户名 {0} trialInfo.ExperimentName, // 项目 {1} - taskInfo.BlindSubjectCode.IsNullOrEmpty() ? taskInfo.Subject.Code : taskInfo.BlindSubjectCode, // 受试者 {2} + subjectCode, // 受试者 {2} taskInfo.TaskBlindName, // 访视 {3} criterion.CriterionName, // 阅片标准 {4} dictionValue[0], // 任务类型 {5} @@ -407,12 +411,13 @@ public class UrgentIRApplyedReReadingConsumer( Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input => { - var topicStr = string.Format(input.topicStr, companyName, trialInfo.ResearchProgramNo); + var subjectCode = taskInfo.BlindSubjectCode.IsNullOrEmpty() ? taskInfo.Subject.Code : taskInfo.BlindSubjectCode; + var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo, subjectCode, taskInfo.TaskBlindName); var htmlBodyStr = string.Format( CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr), userinfo.FullName, // 用户名 {0} trialInfo.ExperimentName, // 项目 {1} - taskInfo.BlindSubjectCode.IsNullOrEmpty() ? taskInfo.Subject.Code : taskInfo.BlindSubjectCode, // 受试者 {2} + subjectCode, // 受试者 {2} taskInfo.TaskBlindName, // 访视 {3} dictionValue[0], // 任务类型 {4} doctorInfo.FullName, // 阅片人 {5} diff --git a/IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs b/IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs index 7a56b88f4..57c802ef8 100644 --- a/IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs +++ b/IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs @@ -298,6 +298,16 @@ namespace IRaCIS.Application.Contracts public string WeChat { get; set; } = String.Empty; public int Nation { get; set; } + /// + /// 工作兼职 + /// + public string WorkPartTime { get; set; } = string.Empty; + + /// + /// 工作兼职En + /// + public string WorkPartTimeEn { get; set; } = string.Empty; + }