From 71702b2abbe2ac3844f642d327815e6dd13db651 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Thu, 20 Mar 2025 14:37:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA=E6=A3=80?=
=?UTF-8?q?=E6=9F=A5=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
IRaCIS.Core.Application/IRaCIS.Core.Application.xml | 8 ++++++++
.../Service/Reading/Dto/ReadingImageTaskViewModel.cs | 5 +++++
.../Reading/ReadingImageTask/ReadingImageTaskService.cs | 2 ++
.../Service/Visit/DTO/VisitPointViewModel.cs | 2 ++
.../Service/Visit/SubjectVisitService.cs | 2 ++
5 files changed, 19 insertions(+)
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index a34123d93..3a7fd3ee1 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -13518,6 +13518,14 @@
+
+
+ 非dicom 临床数据
+
+
+
+
+
维护临床数据 --一定要在同步表前同步数据才行
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index 60b2ddebe..35dbec68e 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -1869,6 +1869,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public ReadingTaskState ReadingTaskState { get; set; }
+ ///
+ /// 是否显示检查名称
+ ///
+ public bool IsShowStudyName { get; set; }
+
///
/// 是否存在未处理的反馈
///
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 058b5e335..d7424fc09 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -3157,6 +3157,7 @@ namespace IRaCIS.Core.Application.Service
});
}
+ var trialInfo = await _trialRepository.Where(x => x.Id == visitTaskInfo.TrialId).FirstNotNullAsync();
// 如果已经签名 就不需要再读了
task.IsNeedReadClinicalData = visitTaskInfo.ReadingTaskState == ReadingTaskState.HaveSigned ? false : task.IsNeedReadClinicalData;
@@ -3169,6 +3170,7 @@ namespace IRaCIS.Core.Application.Service
task.SubjectCode = blindSubjectCode.IsNullOrEmpty() ? task.SubjectCode : blindSubjectCode;
task.ExistsManual = (await GetManualList(new GetManualListInDto() { TrialId = visitTaskInfo.TrialId })).Count > 0;
task.ReadingTaskState = visitTaskInfo.ReadingTaskState;
+ task.IsShowStudyName= trialInfo.IsShowStudyName;
task.IsExistUnprocessedFeedback = await _userFeedBackRepository.AnyAsync(x => x.VisitTaskId == task.VisitTaskId && x.State == 0);
// 添加默认答案
if (inDto.VisitTaskId == null && visitTaskInfo.ReadingTaskState != ReadingTaskState.HaveSigned)
diff --git a/IRaCIS.Core.Application/Service/Visit/DTO/VisitPointViewModel.cs b/IRaCIS.Core.Application/Service/Visit/DTO/VisitPointViewModel.cs
index 02e3bdded..5f0b329e8 100644
--- a/IRaCIS.Core.Application/Service/Visit/DTO/VisitPointViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Visit/DTO/VisitPointViewModel.cs
@@ -270,6 +270,8 @@ namespace IRaCIS.Core.Application.Contracts
public bool IsDicom { get; set; } = true;
+ public string StudyName { get; set; } = string.Empty;
+
public List SeriesList { get; set; } = new List();
}
diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
index 8e28ae4f4..472a9268a 100644
--- a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
@@ -506,6 +506,7 @@ namespace IRaCIS.Core.Application.Services
.Select(k => new VisitStudyDTO()
{
InstanceCount = k.InstanceCount,
+ StudyName=k.StudyName,
Modalities = k.Modalities,
//SeriesCount = k.SeriesCount,
StudyCode = k.StudyCode,
@@ -692,6 +693,7 @@ namespace IRaCIS.Core.Application.Services
{
InstanceCount = x.FileCount,
StudyId = x.Id,
+ StudyName = x.StudyName,
Modalities = x.Modality,
//SeriesCount = 1,
StudyCode = x.StudyCode,