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

增加项目邮件配置稽查

Uat_Study
hang 2023-02-17 16:37:46 +08:00
parent 3780a182ca
commit a52adf9723
2 changed files with 44 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -854,7 +854,7 @@ namespace IRaCIS.Core.Application.Service
[HttpPost]
public async Task<List<TrialEmailNoticeConfigView>> GetTrialEmailNoticeConfigList(TrialEmailNoticeConfigQuery inQuery)
{
await SyncSystemEmainCofigDocListAsync(inQuery.TrialId);
var trialEmailNoticeConfigQueryable = _trialEmailNoticeConfigRepository.Where(t => t.TrialId == inQuery.TrialId)
.WhereIf(inQuery.IsDistinguishCriteria == false, t => t.TrialReadingCriterionId == null)

60
IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
View File

@ -114,6 +114,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var entity = item.Entity as Trial;
var extraIdentification = string.Empty;
//阅片标准
var criterionNameList = await _dbContext.ReadingQuestionCriterionTrial.Where(t => t.TrialId == entity.Id && t.IsConfirm).OrderBy(t => t.ShowOrder).Select(t => t.CriterionName).ToListAsync();
@ -134,9 +136,32 @@ namespace IRaCIS.Core.Infra.EFCore.Common
//}
//trialDics = await this._dbContext.Dictionary.Where(x => dictionaryIds.Contains(x.Id)).Select(x => x.ValueCN).ToListAsync();
Guid id = entity.Id;
var oldentity = await _dbContext.Trial.Where(x => x.Id == id).Select(t => new { t.IsTrialBasicLogicConfirmed, t.IsTrialProcessConfirmed,
t.IsTrialUrgentConfirmed ,t.IsConfigureEmail}).FirstOrDefaultAsync();
switch (_userInfo.RequestUrl)
{
case "configTrialBasicInfo/ConfigTrialBasicInfoConfirm":
extraIdentification= $"/{oldentity.IsTrialBasicLogicConfirmed.ToString()}";
break;
case "configTrialBasicInfo/ConfigTrialUrgentInfoConfirm":
extraIdentification = $"/{oldentity.IsTrialUrgentConfirmed.ToString()}";
break;
case "TrialEmailNoticeConfig/setTrialEmail":
extraIdentification = oldentity.IsConfigureEmail? "/EmailUpdate" : "/EmailSave";
break;
}
await InsertInspection<Trial>(item.Entity as Trial, type, x => new InspectionConvertDTO()
{
TrialId = x.Id,
ExtraIndentification= extraIdentification,
}, new
{
//TrialDicList = string.Join(",", trialDics)
@ -145,6 +170,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
ClinicalDataSetNames = clinicalDataSetNameList.Count() > 0 ? string.Join(",", clinicalDataSetNameList) : String.Empty,
}); ;
}
@ -2560,23 +2586,23 @@ namespace IRaCIS.Core.Infra.EFCore.Common
type = type + (basicData.ParentId == null ? "/parent" : string.Empty);
break;
case nameof(Trial):
var trial = entityObj as Trial;
Guid id = trial.Id;
var oldentity = await _dbContext.Trial.Where(x => x.Id == id).Select(t => new { t.IsTrialBasicLogicConfirmed, t.IsTrialProcessConfirmed, t.IsTrialUrgentConfirmed }).FirstOrDefaultAsync();
switch (_userInfo.RequestUrl.ToLower())
{
case "configtrialbasicinfo/configtrialbasicinfoconfirm":
type = type + "/" + oldentity.IsTrialBasicLogicConfirmed.ToString();
break;
//case "configtrialbasicinfo/configtrialprocessinfoconfirm":
// type = type + "/" + oldentity.IsTrialProcessConfirmed.ToString();
// break;
case "configtrialbasicinfo/configtrialurgentinfoconfirm":
type = type + "/" + oldentity.IsTrialUrgentConfirmed.ToString();
break;
}
break;
//case nameof(Trial):
// var trial = entityObj as Trial;
// Guid id = trial.Id;
// var oldentity = await _dbContext.Trial.Where(x => x.Id == id).Select(t => new { t.IsTrialBasicLogicConfirmed, t.IsTrialProcessConfirmed, t.IsTrialUrgentConfirmed }).FirstOrDefaultAsync();
// switch (_userInfo.RequestUrl.ToLower())
// {
// case "configtrialbasicinfo/configtrialbasicinfoconfirm":
// type = type + "/" + oldentity.IsTrialBasicLogicConfirmed.ToString();
// break;
// //case "configtrialbasicinfo/configtrialprocessinfoconfirm":
// // type = type + "/" + oldentity.IsTrialProcessConfirmed.ToString();
// // break;
// case "configtrialbasicinfo/configtrialurgentinfoconfirm":
// type = type + "/" + oldentity.IsTrialUrgentConfirmed.ToString();
// break;
// }
// break;
//case nameof(ReadingQuestionTrial):