XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

Uat_IRC_Net8
he 2025-05-08 13:41:47 +08:00
parent 9e9f07e4fd a0294e6bd6
commit 1cdfc5f2b5
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/MassTransit/Consumer/SiteSurverEmailConsumer.cs
View File

@ -300,7 +300,7 @@ public class SiteSurverRejectedEventConsumer(
Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input => Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
{ {
var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo); var topicStr = string.Format(input.topicStr, companyName,trialInfo.ResearchProgramNo);
var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr), var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
toUserName, toUserName,
trialInfo.TrialCode, trialInfo.TrialCode,

21
IRaCIS.Core.Infra.EFCore/Interceptor/AddDomainExt.cs
View File

@ -115,9 +115,9 @@ public static class DBContext_Ext
} }
// 重传影像 // 重传影像
//CRC 申请 || PM审批的时候 //CRC 申请 || PM审批的时候
if ((originRequestBackState == RequestBackStateEnum.NotRequest && subjectVisit.RequestBackState == RequestBackStateEnum.CRC_RequestBack) || if ((originRequestBackState != RequestBackStateEnum.CRC_RequestBack && subjectVisit.RequestBackState == RequestBackStateEnum.CRC_RequestBack) ||
(originRequestBackState == RequestBackStateEnum.CRC_RequestBack && (subjectVisit.RequestBackState == RequestBackStateEnum.PM_AgressBack || subjectVisit.RequestBackState == RequestBackStateEnum.PM_NotAgree ))) (originRequestBackState == RequestBackStateEnum.CRC_RequestBack && (subjectVisit.RequestBackState == RequestBackStateEnum.PM_AgressBack || subjectVisit.RequestBackState == RequestBackStateEnum.PM_NotAgree)))
{ {
subjectVisit.AddDomainEvent(new CheckReuploadEvent() { RequestBackState = subjectVisit.RequestBackState, SubjectVisitId = subjectVisit.Id }); subjectVisit.AddDomainEvent(new CheckReuploadEvent() { RequestBackState = subjectVisit.RequestBackState, SubjectVisitId = subjectVisit.Id });
} }
@ -172,7 +172,7 @@ public static class DBContext_Ext
if ( if (
//CRC 申请 //CRC 申请
(originReuploadEnum == QCChanllengeReuploadEnum.None && qCChallenge.ReuploadEnum == QCChanllengeReuploadEnum.CRCRequestReupload) (originReuploadEnum != QCChanllengeReuploadEnum.CRCRequestReupload && qCChallenge.ReuploadEnum == QCChanllengeReuploadEnum.CRCRequestReupload)
|| ||
//同意申请 //同意申请
(originReuploadEnum == QCChanllengeReuploadEnum.CRCRequestReupload && qCChallenge.ReuploadEnum == QCChanllengeReuploadEnum.QCAgreeUpload)) (originReuploadEnum == QCChanllengeReuploadEnum.CRCRequestReupload && qCChallenge.ReuploadEnum == QCChanllengeReuploadEnum.QCAgreeUpload))
@ -333,7 +333,7 @@ public static class DBContext_Ext
var originReReadingApplyState = entry.Property(p => p.ReReadingApplyState).OriginalValue; var originReReadingApplyState = entry.Property(p => p.ReReadingApplyState).OriginalValue;
if (originReReadingApplyState == ReReadingApplyState.Default && (visitTask.ReReadingApplyState == ReReadingApplyState.DocotorHaveApplyed || visitTask.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed)) if ((originReReadingApplyState != ReReadingApplyState.TrialGroupHaveApplyed && originReReadingApplyState != ReReadingApplyState.DocotorHaveApplyed) && (visitTask.ReReadingApplyState == ReReadingApplyState.DocotorHaveApplyed || visitTask.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed))
{ {
var findSubjectVisit = new EnrollmentConfirmAndPD(); var findSubjectVisit = new EnrollmentConfirmAndPD();
@ -359,9 +359,10 @@ public static class DBContext_Ext
} }
visitTask.AddDomainEvent(new HaveReadVisitTaskReReading() { SubjectId=visitTask.SubjectId, VisitTaskId = visitTask.Id, ReReadingApplyState = visitTask.ReReadingApplyState }); if (visitTask.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed)
{
visitTask.AddDomainEvent(new HaveReadVisitTaskReReading() { SubjectId = visitTask.SubjectId, VisitTaskId = visitTask.Id, ReReadingApplyState = visitTask.ReReadingApplyState });
}
} }
@ -395,7 +396,7 @@ public static class DBContext_Ext
if ( if (
//申请的时候 //申请的时候 每次申请都是新的记录，所以状态只会存在前进，不会存在驳回后或者同意后再次变为申请
(subjectVisitImageBackRecord.ImageBackState == ImageBackStateEnum.None && (subjectVisitImageBackRecord.ImageBackState == ImageBackStateEnum.None &&
(subjectVisitImageBackRecord.ApplyUserRole == ImageBackApplyEnum.IQCRequestBack || subjectVisitImageBackRecord.ApplyUserRole == ImageBackApplyEnum.CRCRequestBack)) || (subjectVisitImageBackRecord.ApplyUserRole == ImageBackApplyEnum.IQCRequestBack || subjectVisitImageBackRecord.ApplyUserRole == ImageBackApplyEnum.CRCRequestBack)) ||
//审核完成的时候 //审核完成的时候
@ -453,7 +454,7 @@ public static class DBContext_Ext
if (spmApproveEnrollIdList.Count > 0) if (spmApproveEnrollIdList.Count > 0)
{ {
lastEnroll.AddDomainEvent(new ReviewerSPMApprovedEvent() { TrialId= lastEnroll.TrialId, EnrollIdList = spmApproveEnrollIdList }); lastEnroll.AddDomainEvent(new ReviewerSPMApprovedEvent() { TrialId = lastEnroll.TrialId, EnrollIdList = spmApproveEnrollIdList });
eventStoreList.AddRange(GetStoreEvents(lastEnroll.DomainEvents)); eventStoreList.AddRange(GetStoreEvents(lastEnroll.DomainEvents));
} }