diff --git a/IRaCIS.Core.API/Controllers/InspectionController.cs b/IRaCIS.Core.API/Controllers/InspectionController.cs
index a1e3b69ac..ee240c0ea 100644
--- a/IRaCIS.Core.API/Controllers/InspectionController.cs
+++ b/IRaCIS.Core.API/Controllers/InspectionController.cs
@@ -100,7 +100,11 @@ namespace IRaCIS.Core.API.Controllers
#endregion
-
+ ///
+ /// 提交阅片问题
+ ///
+ ///
+ ///
[HttpPost, Route("Inspection/ReadingImageTask/SubmitVisitTaskQuestionsInDto")]
[UnitOfWork]
public async Task SubmitVisitTaskQuestions(DataInspectionDto opt)
diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.xml b/IRaCIS.Core.API/IRaCIS.Core.API.xml
index c7c5b508d..12430aba4 100644
--- a/IRaCIS.Core.API/IRaCIS.Core.API.xml
+++ b/IRaCIS.Core.API/IRaCIS.Core.API.xml
@@ -90,6 +90,13 @@
+
+
+ 提交阅片问题
+
+
+
+
配置 基础逻辑信息并确认
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index dd6053382..f78fa400b 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -1285,7 +1285,7 @@
返回对象
-
+
标准
@@ -1295,6 +1295,11 @@
+
+
+ 项目标准Id
+
+
项目Id
@@ -4236,6 +4241,13 @@
IR影像阅片
+
+
+ 获取阅片非Dicom文件
+
+
+
+
获取项目已确认的标准
@@ -4257,6 +4269,13 @@
+
+
+ 提交问题
+
+
+
+
阅片期配置
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index 2d4c9dd48..b83f84bed 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -46,7 +46,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public class GetTrialReadingQuestionInDto
{
[NotDefault]
- public Guid CriterionId { get; set; }
+ public Guid ReadingQuestionCriterionTrialId { get; set; }
}
///
diff --git a/IRaCIS.Core.Application/Service/Reading/Interface/IReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/Interface/IReadingImageTaskService.cs
index a99495361..1b1c4e6dd 100644
--- a/IRaCIS.Core.Application/Service/Reading/Interface/IReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Interface/IReadingImageTaskService.cs
@@ -6,7 +6,6 @@
using IRaCIS.Core.Application.Service.Reading.Dto;
-using IRaCIS.Core.Domain.Share.Reading;
namespace IRaCIS.Core.Application.Contracts
{
diff --git a/IRaCIS.Core.Application/Service/Reading/Interface/IReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/Interface/IReadingQuestionService.cs
index 92946e12b..41d62e890 100644
--- a/IRaCIS.Core.Application/Service/Reading/Interface/IReadingQuestionService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Interface/IReadingQuestionService.cs
@@ -6,7 +6,6 @@
using IRaCIS.Core.Application.Service.Reading.Dto;
-using IRaCIS.Core.Domain.Share.Reading;
namespace IRaCIS.Core.Application.Contracts
{
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index 009fba6f8..0eedbec77 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -33,9 +33,9 @@ namespace IRaCIS.Application.Services
IMapper mapper,
IRepository noneDicomStudyRepository,
IRepository visitTaskRepository,
- IRepository readingTaskQuestionAnswerRepository,
- IRepository readingQuestionCriterionTrialRepository,
- IRepository readingQuestionTrialRepository
+ IRepository readingTaskQuestionAnswerRepository,
+ IRepository readingQuestionCriterionTrialRepository,
+ IRepository readingQuestionTrialRepository
)
{
this.mapper = mapper;
@@ -46,23 +46,27 @@ namespace IRaCIS.Application.Services
this._readingQuestionTrialRepository = readingQuestionTrialRepository;
}
- /////
- ///// 获取阅片非Dicom文件
- /////
- /////
- /////
- //[HttpPost]
- //public async Task> GetReadingImageFile(GetReadingImgInDto inDto)
- //{
- // var subjectVisitId=await _visitTaskRepository.Where(x=>x.Id==inDto.VisitTaskId).Select(x=>x.vi)
-
- // List imgList =await _noneDicomStudyRepository.Where(x => x.SubjectVisitId == inDto.SubjectVisitId)
- // .SelectMany(x => x.NoneDicomFileList).Select(x=> new GetReadingImgOutDto() {
- // FileName=x.FileName,
- // Path=x.Path
- // }).ToListAsync();
- // return imgList;
- //}
+ ///
+ /// 获取阅片非Dicom文件
+ ///
+ ///
+ ///
+ [HttpPost]
+ public async Task> GetReadingImageFile(GetReadingImgInDto inDto)
+ {
+ Guid? subjectVisitId = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Select(x => x.SourceSubjectVisitId).FirstOrDefaultAsync();
+ if (subjectVisitId == null)
+ {
+ throw new QueryBusinessObjectNotExistException($"数据异常,当前任务没有访视Id");
+ }
+ List imgList = await _noneDicomStudyRepository.Where(x => x.SubjectVisitId == subjectVisitId)
+ .SelectMany(x => x.NoneDicomFileList).Select(x => new GetReadingImgOutDto()
+ {
+ FileName = x.FileName,
+ Path = x.Path
+ }).ToListAsync();
+ return imgList;
+ }
///
/// 获取项目已确认的标准
@@ -89,7 +93,7 @@ namespace IRaCIS.Application.Services
[HttpPost]
public async Task> GetTrialReadingQuestion(GetTrialReadingQuestionInDto inDto)
{
- var qusetionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == inDto.CriterionId).ToListAsync();
+ var qusetionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == inDto.ReadingQuestionCriterionTrialId).ToListAsync();
List groupList = _mapper.Map>(qusetionList.Where(x => x.ParentId == null));
groupList.ForEach(x =>