修改一版
parent
87142d04d2
commit
1057ade163
|
@ -121,8 +121,8 @@ namespace IRaCIS.Application.Services
|
|||
VisitTaskId = x.Id,
|
||||
TaskBlindName=x.TaskBlindName,
|
||||
ReadingCategory = x.ReadingCategory,
|
||||
VisistId = x.ReadModule != null ? x.ReadModule.SubjectVisitId : x.SourceSubjectVisit.Id,
|
||||
VisitNum = x.ReadModule != null ? x.ReadModule.VisitNum : x.SourceSubjectVisit.VisitNum,
|
||||
VisistId = x.SourceSubjectVisitId != null ? x.SourceSubjectVisitId.Value : x.ReadModule.SubjectVisitId,
|
||||
VisitNum = x.SourceSubjectVisitId != null ? x.SourceSubjectVisit.VisitNum : x.ReadModule.VisitNum,
|
||||
}).OrderBy(x => x.VisitNum).ThenBy(x => x.ReadingCategory);
|
||||
|
||||
task =await taskquery.FirstOrDefaultAsync();
|
||||
|
|
|
@ -237,7 +237,8 @@ namespace IRaCIS.Core.Application.Service
|
|||
await _taskMedicalReviewRepository.UpdatePartialFromQueryAsync(inDto.TaskMedicalReviewId, x => new TaskMedicalReview()
|
||||
{
|
||||
|
||||
SaveQuestionTime = DateTime.Now
|
||||
SaveQuestionTime = DateTime.Now,
|
||||
AuditState = MedicalReviewAuditState.Auditing,
|
||||
});
|
||||
|
||||
var result = await _readingMedicineQuestionAnswerRepository.SaveChangesAsync();
|
||||
|
@ -260,7 +261,8 @@ namespace IRaCIS.Core.Application.Service
|
|||
IsSendMessage = inDto.IsSendDialog && inDto.IsHaveQuestion,
|
||||
AuditAdviceEnum = inDto.AuditAdviceEnum,
|
||||
SaveConclusionTime=DateTime.Now,
|
||||
|
||||
AuditState= MedicalReviewAuditState.Auditing,
|
||||
|
||||
});
|
||||
|
||||
var medicalReview = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).FirstNotNullAsync();
|
||||
|
|
|
@ -97,10 +97,10 @@ namespace IRaCIS.Core.Infra.EFCore
|
|||
modelBuilder.Entity<SubjectUser>().HasMany(t => t.SubjectArmVisitTaskList).WithOne(t=>t.SujectArm).HasForeignKey(t => new { t.SubjectId,t.ArmEnum}).HasPrincipalKey(u => new { u.SubjectId,u.ArmEnum });
|
||||
modelBuilder.Entity<VisitTask>().HasMany(t => t.JudgeVisitList).WithOne(t=>t.JudgeVisitTask);
|
||||
|
||||
//modelBuilder.Entity<VisitTask>().HasMany(t => t.SameVisitTaskList).WithOne().HasForeignKey(t=>t.SourceSubjectVisitId).HasPrincipalKey(u=>u.SourceSubjectVisitId);
|
||||
modelBuilder.Entity<VisitTask>().HasMany(t => t.SameVisitTaskList).WithOne().HasForeignKey(t => t.SourceSubjectVisitId);
|
||||
|
||||
//modelBuilder.Entity<VisitTask>().HasMany(t => t.AnalysisVisitTaskList).WithOne().HasForeignKey(t => t.TaskConsistentRuleId).HasPrincipalKey(u => u.SourceSubjectVisitId);
|
||||
|
||||
|
||||
|
||||
|
||||
modelBuilder.Entity<Dictionary>().HasMany(t => t.ChildList).WithOne(t => t.Parent);
|
||||
|
|
Loading…
Reference in New Issue