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-12-18 17:46:02 +08:00
parent 337dec37b8 c12ecfdcf0
commit b4c884a367
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs
View File

@ -246,6 +246,14 @@ namespace IRaCIS.Core.Application.Service
trial = await _trialRepository.AddAsync(trial);
#region 邮件默认值
trial.EmailAuthorizationCode = _systemEmailConfig.AuthorizationCode;
trial.EmailFromEmail = _systemEmailConfig.FromEmail;
trial.EmailFromName = $"{_systemEmailConfig.FromName}-{trial.TrialCode}";
trial.EmailSMTPServerAddress = _systemEmailConfig.Host;
trial.EmailSMTPServerPort = _systemEmailConfig.Port;
#endregion
//如果是PM， 则需要将该人员添加到 运维人员表
//添加运维人员PM
await _trialIdentityUserRepository.AddAsync(new TrialIdentityUser()
@ -331,13 +339,7 @@ namespace IRaCIS.Core.Application.Service
trial.UpdateTime = DateTime.Now;
#region 邮件默认值
trial.EmailAuthorizationCode = _systemEmailConfig.AuthorizationCode;
trial.EmailFromEmail = _systemEmailConfig.FromEmail;
trial.EmailFromName = $"{_systemEmailConfig.FromName}-{trial.TrialCode}";
trial.EmailSMTPServerAddress = _systemEmailConfig.Host;
trial.EmailSMTPServerPort = _systemEmailConfig.Port;
#endregion
var success = await _trialRepository.SaveChangesAsync();

7
IRaCIS.Core.Application/Service/TrialSiteUser/TrialStatService.cs
View File

@ -16,6 +16,7 @@ namespace IRaCIS.Core.Application;
[ApiExplorerSettings(GroupName = "Trial")]
public class TrialStatService(
IRepository<Trial> _trialRepository,
IRepository<ReadingQuestionTrial> _readingQuestionTrialRepository,
IRepository<SubjectVisit> _subjectVisitRepository,
IRepository<TrialDocument> _trialDocumentRepository,
IRepository<SystemDocument> _systemDocumentRepository,
@ -118,7 +119,7 @@ public class TrialStatService(
var trialReadingCriterionId = inQuery.TrialReadingCriterionId;
//每次查询必须是单标准的
var criterion = await _readingQuestionCriterionTrialRepository.Where(t => t.Id == trialReadingCriterionId).Select(t => new { t.CriterionType, t.CriterionGroup, t.IsGlobalReading, t.IsArbitrationReading, t.IsOncologyReading, t.CriterionName, t.ArbitrationRule }).FirstNotNullAsync();
var criterion = await _readingQuestionCriterionTrialRepository.Where(t => t.Id == trialReadingCriterionId).Select(t => new { t.CriterionType, t.CriterionGroup, t.IsGlobalReading, t.IsArbitrationReading, t.IsOncologyReading, t.CriterionName, t.ArbitrationRule,t.TrialId }).FirstNotNullAsync();
if (criterion.CriterionGroup == CriterionGroup.Nontumorous)
@ -181,8 +182,8 @@ public class TrialStatService(
var list = await query.ToListAsync();
var dicName = await _readingQuestionCriterionTrialRepository.Where(t => t.Id == trialReadingCriterionId).SelectMany(t => t.ReadingQuestionTrialList.Where(t => t.QuestionType == questionType))
.Select(t => t.DictionaryCode).FirstOrDefaultAsync();
var dicName = await _readingQuestionTrialRepository.Where(t => t.TrialId == criterion.TrialId)
.Where(t => t.QuestionType == questionType).Select(t => t.DictionaryCode).FirstOrDefaultAsync();
if (criterion.IsArbitrationReading)