From 99ee8c47574498e0379df3df2a88132a0f9f07e1 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 21 Apr 2025 17:00:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Management/UserService.cs | 2 +- .../_DomainEvent/ReUploadEvent.cs | 65 +++++++++++++++++++ .../_DomainEvent/ReviewerEvent.cs | 24 +++++++ 3 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 IRaCIS.Core.Domain/_DomainEvent/ReUploadEvent.cs create mode 100644 IRaCIS.Core.Domain/_DomainEvent/ReviewerEvent.cs diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs index 337802fea..2666bbfa2 100644 --- a/IRaCIS.Core.Application/Service/Management/UserService.cs +++ b/IRaCIS.Core.Application/Service/Management/UserService.cs @@ -514,7 +514,7 @@ namespace IRaCIS.Core.Application.Service .WhereIf(inQuery.UserState != null, t => t.Status == inQuery.UserState) .WhereIf(inQuery.IsTestUser != null, t => t.IsTestUser == inQuery.IsTestUser) .WhereIf(inQuery.IsZhiZhun != null, t => t.IsZhiZhun == inQuery.IsZhiZhun) - .WhereIf(inQuery.UserCeateSource != null, t => t.UserCeateSource == inQuery.UserCeateSource) + .WhereIf(inQuery.UserCeateSource != null, t => t.UserCeateSource == inQuery.UserCeateSource) .ProjectTo(_mapper.ConfigurationProvider); return await userQueryable.ToPagedListAsync(inQuery); diff --git a/IRaCIS.Core.Domain/_DomainEvent/ReUploadEvent.cs b/IRaCIS.Core.Domain/_DomainEvent/ReUploadEvent.cs new file mode 100644 index 000000000..553635865 --- /dev/null +++ b/IRaCIS.Core.Domain/_DomainEvent/ReUploadEvent.cs @@ -0,0 +1,65 @@ +using IRaCIS.Core.Domain.BaseModel; +using IRaCIS.Core.Domain.Share; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace IRaCIS.Core.Domain._DomainEvent +{ + /// + /// 直接申请流程 IQC申请，PM/APM审批，通知IQC和CRC；CRC申请，PM/APM审批，通知CRC； SubjectVisitImageBackRecord表 + /// + public class DirectApplyReupdloadEvent : DomainEvent + { + + /// + /// 影像回退记录Id + /// + public Guid SubjectVisitImageBackRecordId { get; set; } + + public Guid SubjectVisitId { get; set; } + + + public ImageBackApplyEnum ApplyUserRole { get; set; } + + } + + /// + /// 正常业务流程申请重传审批 一致性核查 CRC申请 （CRC申请，PM/APM审批，通知CRC；） SubjectVisit表 + /// + public class CheckReuploadApprovalEvent : DomainEvent + { + public Guid SubjectVisitId { get; set; } + + [Comment("一致性核查 回退")] + public RequestBackStateEnum RequestBackState { get; set; } + } + + /// + ///正常业务流程申请重传审批 质疑CRC 申请 (CRC申请，IQC审批，通知CRC；) QCChallenge表 + /// + public class QCChanllengeReuploadApprovalEvent : DomainEvent + { + public Guid SubjectVisitId { get; set; } + public QCChanllengeReuploadEnum ReuploadEnum { get; set; } + } + + + /// + ///针对于未阅的任务 PM直接退回，通知CRC + /// + public class UnReadVisitTaskReReadingApproval : DomainEvent + { + public Guid VisitTaskId { get; set; } + } + + /// + ///针对于已阅的任务 PM 申请， SPM/CPM审批，通知PM/阅片人 + /// + public class HaveReadVisitTaskReReadingApproval : DomainEvent + { + public Guid VisitTaskId { get; set; } + } +} diff --git a/IRaCIS.Core.Domain/_DomainEvent/ReviewerEvent.cs b/IRaCIS.Core.Domain/_DomainEvent/ReviewerEvent.cs new file mode 100644 index 000000000..539d5f26c --- /dev/null +++ b/IRaCIS.Core.Domain/_DomainEvent/ReviewerEvent.cs @@ -0,0 +1,24 @@ +using IRaCIS.Core.Domain.BaseModel; +using IRaCIS.Core.Domain.Share; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace IRaCIS.Core.Domain._DomainEvent +{ + + /// + /// SPM审批通过，通知PM； (在消费者中判断项目是否配置了SPM 并且有SPM,有的话才发邮件,因为没有SPM的时候，状态会跳的 ) Enroll表 + /// + public class ReviewerSPMApprovedEvent : DomainEvent + { + List EnrollIdList { get; set; } + + /// + /// 有SPM 会从 EnrollStatus.HasCommittedToCRO -> InviteIntoGroup + /// + public EnrollStatus EnrollStatus { get; set; } + } +} From a8babb53f2c9fd9c70fac32b44d2f6a3e76c2156 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 22 Apr 2025 09:20:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E5=8C=BA?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.API/_ServiceExtensions/hangfireSetup.cs | 2 +- IRaCIS.Core.Application/Helper/HangfireJobHelper.cs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/IRaCIS.Core.API/_ServiceExtensions/hangfireSetup.cs b/IRaCIS.Core.API/_ServiceExtensions/hangfireSetup.cs index 1e2eff9eb..a2b4562ac 100644 --- a/IRaCIS.Core.API/_ServiceExtensions/hangfireSetup.cs +++ b/IRaCIS.Core.API/_ServiceExtensions/hangfireSetup.cs @@ -27,7 +27,7 @@ namespace IRaCIS.Core.API hangFireConfig.UseSqlServerStorage(hangFireConnStr, new SqlServerStorageOptions() { SchemaName = "dbo", - }).UseRecommendedSerializerSettings().UseSimpleAssemblyNameTypeSerializer(); + }).UseRecommendedSerializerSettings().UseSimpleAssemblyNameTypeSerializer() } diff --git a/IRaCIS.Core.Application/Helper/HangfireJobHelper.cs b/IRaCIS.Core.Application/Helper/HangfireJobHelper.cs index 3ac0c7dc2..c037fbd05 100644 --- a/IRaCIS.Core.Application/Helper/HangfireJobHelper.cs +++ b/IRaCIS.Core.Application/Helper/HangfireJobHelper.cs @@ -20,12 +20,12 @@ namespace IRaCIS.Core.Application.Helper //添加 或者更新定时任务 Id 要唯一标识一个定义任务 public static void AddOrUpdateCronJob(string jobId, Expression> methodCall, string cron, string queueName = "default") { - RecurringJob.AddOrUpdate(jobId, queueName, methodCall, cron); + RecurringJob.AddOrUpdate(jobId, queueName, methodCall, cron, new RecurringJobOptions() { TimeZone = TimeZoneInfo.Local }); } public static void AddOrUpdateInitCronJob(string jobId, Expression> methodCall, string cron) { - RecurringJob.AddOrUpdate(jobId, "sys_init", methodCall, cron); + RecurringJob.AddOrUpdate(jobId, "sys_init", methodCall, cron, new RecurringJobOptions() { TimeZone = TimeZoneInfo.Local }); } public static void RemoveCronJob(string jobId) @@ -73,7 +73,7 @@ namespace IRaCIS.Core.Application.Helper case EmailBusinessScenario.QCToCRCImageQuestion: HangfireJobHelper.AddOrUpdateCronJob(jobId, t => t.Send(new QCImageQuestionRecurringEvent() { TrialId = trialId }, default), emailCron); break; - //加急阅片 10分钟 + //加急阅片 10分钟 case EmailBusinessScenario.ExpeditedReading: HangfireJobHelper.AddOrUpdateCronJob(jobId, t => t.Send(new UrgentIRUnReadTaskRecurringEvent() { TrialId = trialId }, default), emailCron); break; @@ -92,7 +92,7 @@ namespace IRaCIS.Core.Application.Helper HangfireJobHelper.AddOrUpdateCronJob(jobId, t => t.Send(new SystemDocumentErverDayEvent() { }, default), emailCron); break; - + default: break; } From df346d31e605a752e3256968ed8ba937613ae538 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 22 Apr 2025 09:24:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.API/_ServiceExtensions/hangfireSetup.cs | 2 +- IRaCIS.Core.Application/IRaCIS.Core.Application.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.API/_ServiceExtensions/hangfireSetup.cs b/IRaCIS.Core.API/_ServiceExtensions/hangfireSetup.cs index a2b4562ac..1e2eff9eb 100644 --- a/IRaCIS.Core.API/_ServiceExtensions/hangfireSetup.cs +++ b/IRaCIS.Core.API/_ServiceExtensions/hangfireSetup.cs @@ -27,7 +27,7 @@ namespace IRaCIS.Core.API hangFireConfig.UseSqlServerStorage(hangFireConnStr, new SqlServerStorageOptions() { SchemaName = "dbo", - }).UseRecommendedSerializerSettings().UseSimpleAssemblyNameTypeSerializer() + }).UseRecommendedSerializerSettings().UseSimpleAssemblyNameTypeSerializer(); } diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 18d1f5f1c..ea8c8d6b0 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -17022,7 +17022,7 @@ SystemDocumentService - + SystemDocumentService