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

Test_IRC_Net8
he 2025-07-02 17:55:31 +08:00
parent 879a85a26f 8f5d391c0d
commit 50d3974cdf
2 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
View File

@ -622,8 +622,8 @@ namespace IRaCIS.Core.Application.Service
var value = new Dictionary<string, object>() var value = new Dictionary<string, object>()
{ {
["Criterion_Enroll_Replace"]= enrollReplace, ["Criterion_Enroll_Replace"] = enrollReplace,
["Criterion_PD_Replace"]= PdReplace, ["Criterion_PD_Replace"] = PdReplace,
["SponsorName"] = taskInfo.SponsorName, ["SponsorName"] = taskInfo.SponsorName,
["ResearchProgramNo"] = taskInfo.ResearchProgramNo, ["ResearchProgramNo"] = taskInfo.ResearchProgramNo,
["TrialSiteCode"] = taskInfo.TrialSiteCode, ["TrialSiteCode"] = taskInfo.TrialSiteCode,
@ -1090,7 +1090,7 @@ namespace IRaCIS.Core.Application.Service
var list = await _readingTableQuestionAnswerRepository.Where(x => x.VisitTaskId == visitTaskId && var list = await _readingTableQuestionAnswerRepository.Where(x => x.VisitTaskId == visitTaskId &&
x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.LesionNumber && x.ReadingQuestionTrial.LesionType == LesionType.BaselineLesions).Select(t => t.Answer).ToListAsync(); x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.LesionNumber && x.ReadingQuestionTrial.LesionType == LesionType.BaselineLesions).Select(t => t.Answer).ToListAsync();
bool exists = list.Any(s => int.TryParse(s, out var n) && n > 100); bool exists = list.Any(s => int.TryParse(s, out var n) && n >= 1);
if (exists) if (exists)
{ {
enrollAnswer = _userInfo.IsEn_Us ? "Yes" : "是"; enrollAnswer = _userInfo.IsEn_Us ? "Yes" : "是";

38
IRaCIS.Core.Application/Triggers/SubjectVisitScanDateTrigger.cs
View File

@ -25,10 +25,6 @@ namespace IRaCIS.Core.Application.Triggers
{ {
await UpdateSubjectVisitImageDateAsync(context.Entity.SubjectVisitId); await UpdateSubjectVisitImageDateAsync(context.Entity.SubjectVisitId);
await _subjectVisitRepository.BatchUpdateNoTrackingAsync(t => t.Id == subjectVisitId, u => new SubjectVisit()
{
VisitExecuted = VisitExecutedEnum.Executed
});
await UpdateSubjectVisitSubmitStateAsync(subjectVisitId); await UpdateSubjectVisitSubmitStateAsync(subjectVisitId);
} }
@ -56,11 +52,6 @@ namespace IRaCIS.Core.Application.Triggers
context.Entity.Modalities = ModaliyStr; context.Entity.Modalities = ModaliyStr;
await _subjectVisitRepository.BatchUpdateNoTrackingAsync(t => t.Id == subjectVisitId, u => new SubjectVisit()
{
VisitExecuted = VisitExecutedEnum.Executed
});
await UpdateSubjectVisitSubmitStateAsync(subjectVisitId); await UpdateSubjectVisitSubmitStateAsync(subjectVisitId);
//添加检查级别临床数据 //添加检查级别临床数据
@ -122,7 +113,7 @@ namespace IRaCIS.Core.Application.Triggers
{ {
await _subjectVisitRepository.UpdatePartialFromQueryAsync(t => t.Id == subjectVisitId && t.SubmitState == SubmitStateEnum.ToSubmit, await _subjectVisitRepository.UpdatePartialFromQueryAsync(t => t.Id == subjectVisitId && t.SubmitState == SubmitStateEnum.ToSubmit,
u => new SubjectVisit() { VisitExecuted = 0, SVENDTC = null, SVSTDTC = null, SubmitState = SubmitStateEnum.None }, true); u => new SubjectVisit() { VisitExecuted = VisitExecutedEnum.UnExecuted, SVENDTC = null, SVSTDTC = null, SubmitState = SubmitStateEnum.None }, true);
} }
else else
{ {
@ -131,11 +122,11 @@ namespace IRaCIS.Core.Application.Triggers
} }
} }
/// <summary> /// <summary>
/// 处理访视拍片日期 /// 处理访视拍片日期
/// </summary> /// </summary>
/// <param name="subjectVisitId"></param> /// <param name="subjectVisitId"></param>
/// <returns></returns> /// <returns></returns>
private async Task UpdateSubjectVisitImageDateAsync(Guid subjectVisitId) private async Task UpdateSubjectVisitImageDateAsync(Guid subjectVisitId)
{ {
var svTime = _subjectVisitRepository.Where(t => t.Id == subjectVisitId).Select(t => new var svTime = _subjectVisitRepository.Where(t => t.Id == subjectVisitId).Select(t => new
@ -157,6 +148,23 @@ namespace IRaCIS.Core.Application.Triggers
LatestScanDate = maxArray.Max() LatestScanDate = maxArray.Max()
}); });
if (minArray.Min() == null && maxArray.Max() == null)
{
await _subjectVisitRepository.BatchUpdateNoTrackingAsync(t => t.Id == subjectVisitId, u => new SubjectVisit()
{
VisitExecuted = VisitExecutedEnum.UnExecuted
});
}
else
{
await _subjectVisitRepository.BatchUpdateNoTrackingAsync(t => t.Id == subjectVisitId, u => new SubjectVisit()
{
VisitExecuted = VisitExecutedEnum.Executed
});
}
} }
} }
} }