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
hang 2025-01-09 15:23:31 +08:00
parent 862da87a0c 0dae3c000c
commit 212268cfa5
2 changed files with 121 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IRaCIS.Core.Application/Service/ReadingCalculate/MRIPDFFCalculateService.cs
View File

@ -364,6 +364,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
var isReadingTaskViewInOrder = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == taskinfo.TrialReadingCriterionId).Select(x => x.IsReadingTaskViewInOrder).FirstOrDefaultAsync();
var baseLineVisitId = await _subjectVisitRepository.Where(x => x.SubjectId == taskinfo.SubjectId && x.IsBaseLine).Select(x => x.Id).FirstOrDefaultAsync();
if (!(await _readingTableQuestionAnswerRepository.AnyAsync(x => x.VisitTaskId == visitTaskId)))
{
var dictionList = await _dictionaryRepository.Where(x => x.Parent.Code == "LiverSegmentation").OrderBy(x => x.ShowOrder).ToListAsync();
@ -445,6 +449,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
await _readingTaskQuestionMarkRepository.AddRangeAsync(_mapper.Map<List<ReadingTaskQuestionMark>>(marks));
await _readingTableQuestionAnswerRepository.SaveChangesAsync();
}
return new AddTaskLesionAnswerFromLastTaskOutDto()
{

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

@ -62,6 +62,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
return new List<Type>()
{
typeof(TrialUserRole),
typeof(TrialIdentityUser),
typeof(TrialSiteSurvey),
typeof(TrialSiteUserRole),
typeof(VisitStage),
@ -1728,6 +1729,54 @@ namespace IRaCIS.Core.Infra.EFCore.Common
});
}
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(UserRole)))
{
var type = GetEntityAuditOpt(item);
var entity = item.Entity as UserRole;
//var user = await _dbContext.Users.Include(x => x.UserTypeRole).FirstOrDefaultAsync(x => x.Id == entity.UserId);
await InsertInspection<UserRole>(entity, type, x => new InspectionConvertDTO
{
IsDistinctionInterface = type == AuditOpt.Update ? true : false,
});
}
// 项目参与人员
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialIdentityUser)))
{
var type = GetEntityAuditOpt(item);
var entity = item.Entity as TrialIdentityUser;
string extraIndentification = string.Empty;
var identityUser = await _dbContext.IdentityUser.AsNoTracking().Where(x => x.Id == entity.IdentityUserId).FirstOrDefaultAsync();
//if (type == AuditOpt.Update)
//{
// extraIndentification = "/" + entity.IsDeleted.ToString();
//}
//var user = await _dbContext.Users.Include(x => x.UserTypeRole).FirstOrDefaultAsync(x => x.Id == entity.UserId);
await InsertInspection<TrialIdentityUser>(entity, type, x => new InspectionConvertDTO
{
//IsDistinctionInterface = true ,
TrialId = x.TrialId,
ObjectRelationParentId = x.TrialId,
ExtraIndentification = extraIndentification,
//ObjectRelationParentId2 = x.IdentityUserId,
},new {
identityUser.FullName,
identityUser.EMail,
identityUser.Code,
identityUser.UserCode,
identityUser.UserName,
identityUser.DepartmentName,
identityUser.Phone,
identityUser.OrganizationName,
});
}
// 项目人员
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialUserRole)))
{