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

修改一版

Uat_Study
he 2022-07-06 17:17:16 +08:00
parent 87142d04d2
commit 1057ade163
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
View File

@ -121,8 +121,8 @@ namespace IRaCIS.Application.Services
VisitTaskId = x.Id, VisitTaskId = x.Id,
TaskBlindName=x.TaskBlindName, TaskBlindName=x.TaskBlindName,
ReadingCategory = x.ReadingCategory, ReadingCategory = x.ReadingCategory,
VisistId = x.ReadModule != null ? x.ReadModule.SubjectVisitId : x.SourceSubjectVisit.Id, VisistId = x.SourceSubjectVisitId != null ? x.SourceSubjectVisitId.Value : x.ReadModule.SubjectVisitId,
VisitNum = x.ReadModule != null ? x.ReadModule.VisitNum : x.SourceSubjectVisit.VisitNum, VisitNum = x.SourceSubjectVisitId != null ? x.SourceSubjectVisit.VisitNum : x.ReadModule.VisitNum,
}).OrderBy(x => x.VisitNum).ThenBy(x => x.ReadingCategory); }).OrderBy(x => x.VisitNum).ThenBy(x => x.ReadingCategory);
task =await taskquery.FirstOrDefaultAsync(); task =await taskquery.FirstOrDefaultAsync();

4
IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
View File

@ -237,7 +237,8 @@ namespace IRaCIS.Core.Application.Service
await _taskMedicalReviewRepository.UpdatePartialFromQueryAsync(inDto.TaskMedicalReviewId, x => new TaskMedicalReview() await _taskMedicalReviewRepository.UpdatePartialFromQueryAsync(inDto.TaskMedicalReviewId, x => new TaskMedicalReview()
{ {
SaveQuestionTime = DateTime.Now SaveQuestionTime = DateTime.Now,
AuditState = MedicalReviewAuditState.Auditing,
}); });
var result = await _readingMedicineQuestionAnswerRepository.SaveChangesAsync(); var result = await _readingMedicineQuestionAnswerRepository.SaveChangesAsync();
@ -260,6 +261,7 @@ namespace IRaCIS.Core.Application.Service
IsSendMessage = inDto.IsSendDialog && inDto.IsHaveQuestion, IsSendMessage = inDto.IsSendDialog && inDto.IsHaveQuestion,
AuditAdviceEnum = inDto.AuditAdviceEnum, AuditAdviceEnum = inDto.AuditAdviceEnum,
SaveConclusionTime=DateTime.Now, SaveConclusionTime=DateTime.Now,
AuditState= MedicalReviewAuditState.Auditing,
}); });

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

@ -97,7 +97,7 @@ 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<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.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<VisitTask>().HasMany(t => t.AnalysisVisitTaskList).WithOne().HasForeignKey(t => t.TaskConsistentRuleId).HasPrincipalKey(u => u.SourceSubjectVisitId);