diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
index 1686a9b37..52bbac44d 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
@@ -152,7 +152,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
///
/// 是否申请重阅
///
- public bool IsApplyHeavyReading { get; set; } = false;
+ public bool? IsApplyHeavyReading { get; set; }
///
@@ -217,7 +217,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
///
/// 是否申请重阅
///
- public bool IsApplyHeavyReading { get; set; } = false;
+ public bool? IsApplyHeavyReading { get; set; }
}
public class SaveMedicineQuestionInDto
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index 14e59e2eb..102705120 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -156,6 +156,12 @@ namespace IRaCIS.Application.Services
{
task.SubjectCode = await _subjectRepository.Where(x => x.Id == task.SubjectId).Select(x => x.Code).FirstOrDefaultAsync();
}
+
+ await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => x.Id == task.VisitTaskId && x.FirstReadingTime == null, x => new VisitTask()
+ {
+ FirstReadingTime = DateTime.Now,
+ });
+ await _visitTaskRepository.SaveChangesAsync();
return task;
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
index 16f984ab3..ea1f07f94 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
@@ -98,6 +98,17 @@ namespace IRaCIS.Core.Application.Service
JudgeVisitTaskId=x.JudgeVisitTaskId,
JudgeResultArm=x.JudgeResultTask.ArmEnum,
SubjectId=x.SubjectId,
+ JudgeInfoList= x.ArmEnum== Arm.JudgeArm? x.JudgeResultTask.ReadingTaskQuestionAnswerList.Where(y=>y.ReadingQuestionTrial.IsJudgeQuestion).Select(y=> new JudgeInfo()
+ {
+ Answer=y.Answer,
+ QuestionName=y.ReadingQuestionTrial.QuestionName,
+
+ }).ToList() : x.ReadingTaskQuestionAnswerList.Where(y => y.ReadingQuestionTrial.IsJudgeQuestion).Select(y => new JudgeInfo()
+ {
+ Answer = y.Answer,
+ QuestionName = y.ReadingQuestionTrial.QuestionName,
+
+ }).ToList()
}).ToListAsync();
List otherTask = await _visitTaskRepository.Where(x => x.ArmEnum != Arm.JudgeArm && x.SubjectId == taskInfo.SubjectId
@@ -133,6 +144,17 @@ namespace IRaCIS.Core.Application.Service
SouceReadModuleId = x.SouceReadModuleId,
SourceSubjectVisitId = x.SourceSubjectVisitId,
SubjectId = x.SubjectId,
+ JudgeInfoList = x.ArmEnum == Arm.JudgeArm ? x.JudgeResultTask.ReadingTaskQuestionAnswerList.Where(y => y.ReadingQuestionTrial.IsJudgeQuestion).Select(y => new JudgeInfo()
+ {
+ Answer = y.Answer,
+ QuestionName = y.ReadingQuestionTrial.QuestionName,
+
+ }).ToList() : x.ReadingTaskQuestionAnswerList.Where(y => y.ReadingQuestionTrial.IsJudgeQuestion).Select(y => new JudgeInfo()
+ {
+ Answer = y.Answer,
+ QuestionName = y.ReadingQuestionTrial.QuestionName,
+
+ }).ToList()
}).ToListAsync();
@@ -462,5 +484,9 @@ namespace IRaCIS.Core.Application.Service
}
+
+
+
+
}
}
diff --git a/IRaCIS.Core.Domain/Allocation/VisitTask.cs b/IRaCIS.Core.Domain/Allocation/VisitTask.cs
index 10bb58933..31b0dc614 100644
--- a/IRaCIS.Core.Domain/Allocation/VisitTask.cs
+++ b/IRaCIS.Core.Domain/Allocation/VisitTask.cs
@@ -98,6 +98,8 @@ namespace IRaCIS.Core.Domain.Models
public Subject Subject { get; set; }
+ public List ReadingTaskQuestionAnswerList { get; set; }
+
//对于裁判项而言,触发裁判的列表
public List JudgeVisitList { get; set; }
diff --git a/IRaCIS.Core.Domain/Reading/ReadingMedicalReviewDialog.cs b/IRaCIS.Core.Domain/Reading/ReadingMedicalReviewDialog.cs
index 803cd52fa..08a9e20e5 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingMedicalReviewDialog.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingMedicalReviewDialog.cs
@@ -79,7 +79,7 @@ namespace IRaCIS.Core.Domain.Models
///
/// 是否申请重阅
///
- public bool IsApplyHeavyReading { get; set; } = false;
+ public bool? IsApplyHeavyReading { get; set; }
[ForeignKey("CreateUserId")]
public User CreateUser { get; set; }
diff --git a/IRaCIS.Core.Domain/Reading/ReadingTaskQuestionAnswer.cs b/IRaCIS.Core.Domain/Reading/ReadingTaskQuestionAnswer.cs
index 5a3437eb8..54f7ce027 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingTaskQuestionAnswer.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingTaskQuestionAnswer.cs
@@ -53,6 +53,12 @@ namespace IRaCIS.Core.Domain.Models
/// 创建人
///
public Guid CreateUserId { get; set; }
+
+ [ForeignKey("VisitTaskId")]
+ public VisitTask VisitTask { get; set; }
+
+ [ForeignKey("ReadingQuestionTrialId")]
+ public ReadingQuestionTrial ReadingQuestionTrial { get; set; }
}