From 486a13a02652d19f062fb9586712595d6e64c5ee Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Wed, 16 Nov 2022 15:14:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../IRaCIS.Core.Application.xml | 62 ++++++++++++++++++-
.../Service/Visit/DTO/VisitPointViewModel.cs | 6 ++
.../Service/Visit/SubjectVisitService.cs | 17 +++--
3 files changed, 74 insertions(+), 11 deletions(-)
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index fb34b40e..bba9ae30 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -3612,6 +3612,21 @@
表格问题类型
+
+
+ 自定义计算标记
+
+
+
+
+ IsDepend
+
+
+
+
+ 自定义计算标记
+
+
数值类型
@@ -3933,6 +3948,16 @@
单位
+
+
+ 自定义计算标记
+
+
+
+
+ 自定义计算标记
+
+
数值类型
@@ -4473,6 +4498,16 @@
单位
+
+
+ 自定义计算标记
+
+
+
+
+ 自定义计算标记
+
+
返回的对象
@@ -6648,6 +6683,16 @@
序号标记
+
+
+ 自定义计算标记
+
+
+
+
+ 自定义计算标记
+
+
问题名称
@@ -7052,12 +7097,13 @@
-
+
获取访视下的Dicom 检查信息 分所有的， 阅片的 不阅片 isReading : 0 查询所有 1 查询仅仅阅片的
+
@@ -8502,6 +8548,20 @@
阅片问题.标准
+
+
+ 获取问题
+
+
+
+
+
+
+ 获取表格问题
+
+
+
+
获取系统问题分组
diff --git a/IRaCIS.Core.Application/Service/Visit/DTO/VisitPointViewModel.cs b/IRaCIS.Core.Application/Service/Visit/DTO/VisitPointViewModel.cs
index 49769515..20db5088 100644
--- a/IRaCIS.Core.Application/Service/Visit/DTO/VisitPointViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Visit/DTO/VisitPointViewModel.cs
@@ -182,6 +182,12 @@ namespace IRaCIS.Core.Application.Contracts
}
+ public class GetReadingVisitStudyListIndto
+ {
+ public Guid TrialId { get; set; }
+ public Guid SujectVisitId { get; set; }
+ public Guid? VisitTaskId { get; set; }
+ }
public class VisitStudyDTO
{
diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
index 9743af4d..305e663e 100644
--- a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
@@ -234,20 +234,17 @@ namespace IRaCIS.Core.Application.Services
///
/// 获取访视下的Dicom 检查信息 分所有的， 阅片的 不阅片 isReading : 0 查询所有 1 查询仅仅阅片的
///
- ///
- ///
- ///
+ ///
///
- [HttpGet, Route("{trialId:guid}/{sujectVisitId:guid}/{visitTaskId}")]
- [AllowAnonymous]
- public async Task> GetReadingVisitStudyList(Guid trialId, Guid sujectVisitId,Guid visitTaskId)
+ [HttpPost]
+ public async Task> GetReadingVisitStudyList(GetReadingVisitStudyListIndto indto)
{
var result = new List();
- var thisRowinfo = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == visitTaskId && x.StudyId != null).ToListAsync();
+ var thisRowinfo = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == indto.VisitTaskId && x.StudyId != null).ToListAsync();
- var taskInfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).FirstNotNullAsync();
+ var taskInfo = await _visitTaskRepository.Where(x => x.Id == indto.VisitTaskId).FirstNotNullAsync();
if(taskInfo.ReadingTaskState == ReadingTaskState.HaveSigned)
{
@@ -285,7 +282,7 @@ namespace IRaCIS.Core.Application.Services
}
- var studyList = await _repository.Where(t => t.TrialId == trialId && t.SubjectVisitId == sujectVisitId).Select(k => new VisitStudyDTO()
+ var studyList = await _repository.Where(t => t.TrialId == indto.TrialId && t.SubjectVisitId == indto.SujectVisitId).Select(k => new VisitStudyDTO()
{
InstanceCount = k.InstanceCount,
Modalities = k.Modalities,
@@ -315,7 +312,7 @@ namespace IRaCIS.Core.Application.Services
// 非Dicom
- var noDicomList = await _noneDicomStudyRepository.Where(x => x.TrialId == trialId && x.SubjectVisitId == sujectVisitId).ToListAsync();
+ var noDicomList = await _noneDicomStudyRepository.Where(x => x.TrialId == indto.TrialId && x.SubjectVisitId == indto.SujectVisitId).ToListAsync();
List noDicomStudyList = noDicomList.Select(x => new VisitStudyDTO()