diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 30df90a3e..9b1403c4f 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -248,11 +248,12 @@ - + - 重阅影响提示列表 仅仅针对已完成的任务申请 + 影响提示列表 重阅仅仅针对已完成的任务申请 退回针对的是未完成的(退回仅仅针对是访视类型的) + diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs index cae32cb05..14e59e2eb 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs @@ -503,7 +503,7 @@ namespace IRaCIS.Application.Services public async Task SubmitVisitTaskQuestions(SubmitVisitTaskQuestionsInDto inDto) { await this.SaveVisitTaskQuestions(inDto); - await _visitTaskRepository.UpdatePartialFromQueryAsync(x => x.Id == inDto.VisitTaskId, x => new VisitTask() + await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => x.Id == inDto.VisitTaskId, x => new VisitTask() { ReadingTaskState = ReadingTaskState.HaveSigned, SignTime=DateTime.Now, @@ -727,7 +727,7 @@ namespace IRaCIS.Application.Services { if (visitTask.IsAnalysisCreate) { - await _visitTaskRepository.UpdatePartialFromQueryAsync(visitTaskId, x => new VisitTask() + await _visitTaskRepository.BatchUpdateNoTrackingAsync(x=>x.Id==visitTaskId, x => new VisitTask() { IsAnalysisDiffToOriginalData = true }); @@ -748,7 +748,7 @@ namespace IRaCIS.Application.Services if (visitTask.IsAnalysisCreate) { - await _visitTaskRepository.UpdatePartialFromQueryAsync(visitTaskId, x => new VisitTask() + await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => x.Id == visitTaskId, x => new VisitTask() { IsAnalysisDiffToOriginalData = false }); diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs index 2dc810245..c2f0b1a07 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs @@ -100,10 +100,8 @@ namespace IRaCIS.Core.Application.Service SubjectId=x.SubjectId, }).ToListAsync(); - List otherTask = await _visitTaskRepository.Where(x => x.ArmEnum != Arm.JudgeArm && x.SubjectId == taskInfo.SubjectId - && x.DoctorUserId != taskInfo.DoctorUserId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ReReadingApplyState != ReReadingApplyState.Agree - ) + && x.DoctorUserId != taskInfo.DoctorUserId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ReReadingApplyState != ReReadingApplyState.Agree) .Where(x => x.IsAnalysisCreate == taskInfo.IsAnalysisCreate) .OrderBy(x => x.VisitTaskNum).Select(x => new TaskInfo() {