diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
index a2e51e465..579d12dd4 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
@@ -99,6 +99,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public Guid VisitTaskId { get; set; }
+ ///
+ /// 无效的 为True无效
+ ///
+ public bool IsInvalid { get; set; }
+
}
public class FinishMedicalReviewInDto
@@ -227,6 +232,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
///
public bool? IsApplyHeavyReading { get; set; }
+
+
+ ///
+ /// 图片路径
+ ///
+ public string ImagePath { get; set; } = string.Empty;
+
}
public class SendMedicalReviewDialogInDto
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index c38bd3827..6cc73294f 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -671,7 +671,14 @@ namespace IRaCIS.Application.Services
JudgeResultImagePath = visitTask.JudgeResultImagePath,
VisitInfoList = new List()
};
- var taskList = await _visitTaskRepository.Where(x => x.JudgeVisitTaskId == inDto.VisitTaskId).OrderBy(x=>x.ArmEnum).ToListAsync();
+
+ var judgeDataInfo = await _readingJudgeInfoRepository.Where(x => x.JudgeTaskId == inDto.VisitTaskId).FirstNotNullAsync();
+
+ var taskids = new List();
+
+ taskids.Add(judgeDataInfo.TaskIdOne);
+ taskids.Add(judgeDataInfo.TaskIdTwo);
+ var taskList = await _visitTaskRepository.Where(x => taskids.Contains(x.Id)).OrderBy(x=>x.ArmEnum).ToListAsync();
judgeInfo.VisitTaskArmList = taskList.Select(x => new VisitTaskArm()
{
ArmEnum = x.ArmEnum,
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
index 0b96a6818..954419b4f 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
@@ -437,6 +437,7 @@ namespace IRaCIS.Core.Application.Service
TaskMedicalReviewId = inDto.TaskMedicalReviewId,
UserTypeShortName = _userInfo.UserTypeShortName,
Content = inDto.Content,
+ ImagePath=inDto.ImagePath,
UserTypeEnumInt = _userInfo.UserTypeEnumInt,
VisitTaskId = visitTaskId,
DisagreeReason = inDto.DisagreeReason,
@@ -585,6 +586,7 @@ namespace IRaCIS.Core.Application.Service
IsClosedDialog=x.IsClosedDialog,
IsHaveQuestion=x.IsHaveQuestion,
MedicalDialogCloseEnum=x.MedicalDialogCloseEnum,
+ IsInvalid=x.IsInvalid,
});