XCKJ
/
EI-Image-Viewer-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xx

Test.EIImageViewer
{872297557@qq.com} 2022-12-27 10:52:56 +08:00
parent a84ec3d4a1
commit c8fed0f04b
7 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
IRaCIS.Core.Application/TestService.cs
View File

@ -23,14 +23,14 @@ namespace IRaCIS.Application.Services
private readonly IOptionsMonitor<SystemEmailSendConfig> _systemEmailConfig;
private readonly IOptionsMonitor<ServiceVerifyConfigOption> _basicConfig;
private readonly IRepository<VisitTask> _visitTaskRepositoryy;
public TestService(IRepository<Dictionary> dicRepository, IRepository<Trial> trialRepository/*, IDistributedCache cache*/
, IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig, IOptionsMonitor<ServiceVerifyConfigOption> basicConfig)
, IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig, IOptionsMonitor<ServiceVerifyConfigOption> basicConfig, IRepository<VisitTask> visitTaskRepository)
{
_visitTaskRepositoryy = visitTaskRepository;
_systemEmailConfig = systemEmailConfig;
_basicConfig = basicConfig;
@ -79,17 +79,17 @@ namespace IRaCIS.Application.Services
// Code = u.Code + 1
//});
var query = from item1 in _repository.Where<ReadingQuestionTrial>()
join item2 in _repository.Where<ReadingQuestionTrial>() on item1.ValueType equals item2.ValueType
select new
{
item1.ValueType,
dd = item2.ValueType
};
//var query = from item1 in _repository.Where<ReadingQuestionTrial>()
// join item2 in _repository.Where<ReadingQuestionTrial>() on item1.ValueType equals item2.ValueType
// select new
// {
// item1.ValueType,
// dd = item2.ValueType
// };
var list2 = query.ToList();
//var list2 = query.ToList();
await Task.CompletedTask;
//await Task.CompletedTask;
//var list = await _repository.Where<ClinicalDataTrialSet>(t => t.TrialId == Guid.Parse("40400000-3e2c-0016-239b-08da581f0e74")).ToListAsync();
@ -101,6 +101,11 @@ namespace IRaCIS.Application.Services
//await _repository.BatchUpdateAsync<DataInspection>(t => t.TrialId == Guid.Parse("40400000-3e2c-0016-239b-08da581f0e74") && t.EntityName== "ClinicalDataTrialSet", t => new DataInspection() { CreateTime= DateTime.Now.AddMonths(-2) } );
await _visitTaskRepositoryy.UpdatePartialFromQueryAsync( Guid.Parse("78360000-3E2C-0016-9B53-08DA6A002040"), c => new VisitTask() { UpdateTime = DateTime.Now });
await _visitTaskRepositoryy.UpdatePartialFromQueryAsync( Guid.Parse("78360000-3E2C-0016-9B53-08DA6A002040"), c => new VisitTask() { UpdateTime = DateTime.Now.AddMinutes(1) });
await _repository.SaveChangesAsync();
return _userInfo.LocalIp;
}

12
IRaCIS.Core.Domain/Allocation/VisitTask.cs
View File

@ -233,13 +233,13 @@ namespace IRaCIS.Core.Domain.Models
public List<ReadingTaskQuestionAnswer> ReadingTaskQuestionAnswerList { get; set; } = new List<ReadingTaskQuestionAnswer>();
////病灶表
//[JsonIgnore]
//public List<ReadingTableAnswerRowInfo> LesionList { get; set; } = new List<ReadingTableAnswerRowInfo>();
//病灶表
[JsonIgnore]
public List<ReadingTableAnswerRowInfo> LesionList { get; set; } = new List<ReadingTableAnswerRowInfo>();
////病灶答案表
//[JsonIgnore]
//public List<ReadingTableQuestionAnswer> LesionAnswerList { get; set; } = new List<ReadingTableQuestionAnswer>();
//病灶答案表
[JsonIgnore]
public List<ReadingTableQuestionAnswer> LesionAnswerList { get; set; } = new List<ReadingTableQuestionAnswer>();

6
IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs
View File

@ -152,9 +152,9 @@ namespace IRaCIS.Core.Domain.Models
public string RowMark { get; set; } = string.Empty;
//[JsonIgnore]
//[ForeignKey("VisitTaskId")]
//public VisitTask VisitTask { get; set; }
[JsonIgnore]
[ForeignKey("VisitTaskId")]
public VisitTask VisitTask { get; set; }
//病灶答案表
[JsonIgnore]

13
IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableQuestionAnswer.cs
View File

@ -79,11 +79,6 @@ namespace IRaCIS.Core.Domain.Models
public ReadingTableAnswerRowInfo Lesion { get; set; }
//[JsonIgnore]
//[ForeignKey("VisitTaskId")]
//public VisitTask VisitTask { get; set; }
[JsonIgnore]
[ForeignKey("QuestionId")]
@ -95,7 +90,13 @@ namespace IRaCIS.Core.Domain.Models
public ReadingTableQuestionTrial ReadingTableQuestionTrial { get; set; }
}
[JsonIgnore]
[ForeignKey("VisitTaskId")]
public VisitTask VisitTask { get; set; }
}
}

2
IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs
View File

@ -115,8 +115,6 @@ namespace IRaCIS.Core.Infra.EFCore
modelBuilder.Entity<VisitTask>().HasMany(t => t.GlobalVisitResultList).WithOne(s => s.GlobalVisitTask).HasForeignKey(t => t.GlobalTaskId);
//modelBuilder.Entity<ReadingGlobalTaskInfo>().HasOne(t=>t.TrialReadingQuestionAnswer).WithOne(t=>t.ReadingQuestionTrialId)
modelBuilder.Entity<Dictionary>().HasMany(t => t.ChildList).WithOne(t => t.Parent);
modelBuilder.Entity<SubjectUser>().HasMany(t => t.EarlierSubjectUserList).WithOne(t => t.OrignalSubjectUser);

2
IRaCIS.Core.Infra.EFCore/Repository/IRaCISContextExtension.cs
View File

@ -88,7 +88,7 @@ namespace IRaCIS.Core.Infra.EFCore
public static void EntityModifyPartialFiled<T>(this IRaCISDBContext _dbContext,T waitModifyEntity, Expression<Func<T, T>> updateFactory) where T : Entity
{
var entityEntry = _dbContext.Entry(waitModifyEntity);
entityEntry.State = EntityState.Detached;
//entityEntry.State = EntityState.Detached;
var list = ((MemberInitExpression)updateFactory.Body).Bindings.Select(mb => mb.Member.Name)
.Select(propName => typeof(T).GetProperty(propName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)).ToList();

2
IRaCIS.Core.Infra.EFCore/Repository/Repository.cs
View File

@ -195,7 +195,7 @@ namespace IRaCIS.Core.Infra.EFCore
}
/// <summary>EF跟踪方式 先查询出来，再更新部分字段 稽查的时候需要完整的实体信息</summary>
/// <summary>EF跟踪方式 先查询出来，再更新部分字段 当在同一个事务里面需要更新同一个实体两次，请使用该方法，否则会因为重复跟踪同一个实体报错 （稽查的时候需要完整的实体信息）</summary>
public async Task<TEntity> UpdatePartialFromQueryAsync(Guid id, Expression<Func<TEntity, TEntity>> updateFactory,
bool autoSave = false, CancellationToken cancellationToken = default)
{