From a9c7c79fb5749a2d1dd2ca2d9262f33bb59c1367 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Thu, 27 Feb 2025 11:16:53 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E9=85=8D=E7=BD=AE?=
=?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
IRaCIS.Core.Domain/Image/DicomStudy.cs | 5 +++
IRaCIS.Core.Domain/Image/NoneDicomStudy.cs | 5 +++
IRaCIS.Core.Domain/Trial/Trial.cs | 37 +++++++++++++++++++
.../Context/IRaCISDBContext.cs | 5 +++
4 files changed, 52 insertions(+)
diff --git a/IRaCIS.Core.Domain/Image/DicomStudy.cs b/IRaCIS.Core.Domain/Image/DicomStudy.cs
index ee9228614..06e648cac 100644
--- a/IRaCIS.Core.Domain/Image/DicomStudy.cs
+++ b/IRaCIS.Core.Domain/Image/DicomStudy.cs
@@ -43,6 +43,11 @@ public class DicomStudy : BaseFullDeleteAuditEntity, IEntitySeqId
public int Code { get; set; }
+ ///
+ /// 检查名称
+ ///
+ public string StudyName { get; set; } = string.Empty;
+
public string Description { get; set; } = null!;
public int InstanceCount { get; set; }
diff --git a/IRaCIS.Core.Domain/Image/NoneDicomStudy.cs b/IRaCIS.Core.Domain/Image/NoneDicomStudy.cs
index 7696dca02..df6f5bb2e 100644
--- a/IRaCIS.Core.Domain/Image/NoneDicomStudy.cs
+++ b/IRaCIS.Core.Domain/Image/NoneDicomStudy.cs
@@ -19,6 +19,11 @@ public class NoneDicomStudy : BaseFullAuditEntity
#endregion
public string StudyCode { get; set; } = string.Empty;
+ ///
+ /// 检查名称
+ ///
+ public string StudyName { get; set; } = string.Empty;
+
public int FileCount { get; set; }
public int Code { get; set; }
diff --git a/IRaCIS.Core.Domain/Trial/Trial.cs b/IRaCIS.Core.Domain/Trial/Trial.cs
index f32bcb561..1312b3857 100644
--- a/IRaCIS.Core.Domain/Trial/Trial.cs
+++ b/IRaCIS.Core.Domain/Trial/Trial.cs
@@ -240,6 +240,25 @@ public partial class Trial : BaseFullDeleteAuditEntity
public string VitrualSiteCode { get; set; } = string.Empty;
+ #region 检查相关新加字段
+
+ ///
+ /// 是否显示检查名称
+ ///
+ public bool IsShowStudyName { get; set; } = false;
+
+ ///
+ /// 检查名称列表
+ ///
+ public List StudyNameList { get; set; } = new List();
+
+ ///
+ /// 图像格式
+ ///
+ [StringLength(2000)]
+ public List ImageFormatList { get; set; } = new List();
+ #endregion
+
#region 邮件配置
[Comment("发件箱账号")]
public string EmailFromEmail { get; set; } = string.Empty;
@@ -290,6 +309,24 @@ public enum CollectImagesType
NoneDicom = 2
}
+///
+/// 检查名称
+///
+
+[ComplexType]
+public class StudyName
+{
+ ///
+ /// 是否选中
+ ///
+ public bool IsChoose { get; set; }
+
+ ///
+ /// 名称
+ ///
+ public string Name { get; set; }
+}
+
[ComplexType]
public class TrialObjectNameConfig
{
diff --git a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs
index 9f9142c6a..e77133622 100644
--- a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs
+++ b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs
@@ -84,6 +84,11 @@ public class IRaCISDBContext : DbContext
{
ownedNavigationBuilder.ToJson();
});
+
+ entity.OwnsMany(x => x.StudyNameList, ownedNavigationBuilder =>
+ {
+ ownedNavigationBuilder.ToJson();
+ });
});
#region pgsql codefirst 配置 暂时屏蔽
From 553a8d392f196ff7c742fc867a119e713f4c98b4 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Thu, 27 Feb 2025 11:33:31 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=BF=94=E5=9B=9E?=
=?UTF-8?q?=E6=A3=80=E6=9F=A5=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Service/QC/DTO/NoneDicomStudyViewModel.cs | 2 ++
.../Service/QC/DTO/QARecordViewModel.cs | 4 ++++
.../Service/QC/QCOperationService.cs | 2 ++
.../Service/TrialSiteUser/DTO/TrialConfigDTO.cs | 17 +++++++++++++++++
IRaCIS.Core.Domain/Trial/Trial.cs | 2 +-
5 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs
index 27061e524..40c1d4472 100644
--- a/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs
+++ b/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs
@@ -13,6 +13,8 @@ namespace IRaCIS.Core.Application.Contracts
public int FileCount { get; set; }
+ public string StudyName { get; set; }
+
public List NoneDicomStudyFileList { get; set; } = new List();
diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs
index 0b834efa9..6503dfbe7 100644
--- a/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs
+++ b/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs
@@ -18,6 +18,8 @@ namespace IRaCIS.Core.Application.Contracts.DTO
public int Type { get; set; }
+ public string StudyName { get; set; } = String.Empty;
+
public string Modality { get; set; } = String.Empty;
public string BodyPart { get; set; } = String.Empty;
@@ -386,6 +388,8 @@ namespace IRaCIS.Core.Application.Contracts.DTO
public string BodyPartForEdit { get; set; } = String.Empty;
+ public string StudyName { get; set; } = string.Empty;
+
public string ModalityForEdit { get; set; } = string.Empty;
public bool IsHaveUploadFailed { get; set; }
diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs
index bf12c9a31..c630017c6 100644
--- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs
+++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs
@@ -762,6 +762,8 @@ namespace IRaCIS.Core.Application.Image.QA
study.BodyPartForEdit = updateModalityCommand.BodyPart;
study.ModalityForEdit = updateModalityCommand.Modality;
+ study.StudyName = updateModalityCommand.StudyName;
+
await _dicomSeriesRepository.BatchUpdateNoTrackingAsync(t => t.StudyId == studyId, r => new DicomSeries() { BodyPartForEdit = updateModalityCommand.BodyPart });
}
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
index 04e6c7e6b..26162b4ae 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
@@ -69,6 +69,23 @@ namespace IRaCIS.Core.Application.Contracts
public List ModalityList { get; set; } = new List();
+ ///
+ /// 是否显示检查名称
+ ///
+ public bool IsShowStudyName { get; set; } = false;
+
+ ///
+ /// 检查名称列表
+ ///
+ public List StudyNameList { get; set; }
+
+ ///
+ /// 图像格式
+ ///
+ [StringLength(2000)]
+ public List ImageFormatList { get; set; } = new List();
+
+
public List TrialObjectNameList { get; set; }
diff --git a/IRaCIS.Core.Domain/Trial/Trial.cs b/IRaCIS.Core.Domain/Trial/Trial.cs
index 1312b3857..e720942e2 100644
--- a/IRaCIS.Core.Domain/Trial/Trial.cs
+++ b/IRaCIS.Core.Domain/Trial/Trial.cs
@@ -250,7 +250,7 @@ public partial class Trial : BaseFullDeleteAuditEntity
///
/// 检查名称列表
///
- public List StudyNameList { get; set; } = new List();
+ public List StudyNameList { get; set; }
///
/// 图像格式
From 72efd36649c4515e4f71490a52a15a4886e55247 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Thu, 27 Feb 2025 13:05:00 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
IRaCIS.Core.Domain/Trial/Trial.cs | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/IRaCIS.Core.Domain/Trial/Trial.cs b/IRaCIS.Core.Domain/Trial/Trial.cs
index e720942e2..0ba5fa28e 100644
--- a/IRaCIS.Core.Domain/Trial/Trial.cs
+++ b/IRaCIS.Core.Domain/Trial/Trial.cs
@@ -325,6 +325,11 @@ public class StudyName
/// 名称
///
public string Name { get; set; }
+
+ ///
+ /// 英文名称
+ ///
+ public string EnName { get; set; }
}
[ComplexType]
From 47755bc2aa2cee2196d3458f38721cd9b1db3b12 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 27 Feb 2025 13:05:09 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=A3=80=E6=9F=A5=20=E8=BF=94=E5=9B=9E?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Service/ImageAndDoc/NoneDicomStudyService.cs | 7 +++++--
IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs | 7 +++++++
IRaCIS.Core.Domain/Trial/Trial.cs | 2 +-
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs
index 1e76770b7..f82a373c9 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs
@@ -28,7 +28,7 @@ namespace IRaCIS.Core.Application.Contracts
[HttpGet]
- public async Task> GetNoneDicomStudyList(
+ public async Task> > GetNoneDicomStudyList(
[FromQuery, NotDefault] Guid subjectVisitId,
[FromQuery] Guid? nonedicomStudyId,
[FromQuery] bool isFilterZip,
@@ -54,7 +54,10 @@ namespace IRaCIS.Core.Application.Contracts
}
- return await noneDicomStudyQueryable.ToListAsync();
+ var list = await noneDicomStudyQueryable.ToListAsync();
+
+ var config = await _subjectVisitRepository.Where(t => t.Id == subjectVisitId).Select(t => new { t.Trial.ImageFormatList, t.Trial.StudyNameList ,t.Trial.IsShowStudyName}).FirstOrDefaultAsync();
+ return ResponseOutput.Ok(list, config) ;
}
diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
index 7b21a2efb..7020f74d1 100644
--- a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
+++ b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
@@ -161,6 +161,13 @@ namespace IRaCIS.Core.Application.Contracts
[Comment("阅片任务产生之前 采集影像")]
public CollectImagesType CollectImagesEnum { get; set; }
+ public List StudyNameList { get; set; }
+
+
+ public List ImageFormatList { get; set; }
+
+ public bool IsShowStudyName { get; set; } = false;
+
}
diff --git a/IRaCIS.Core.Domain/Trial/Trial.cs b/IRaCIS.Core.Domain/Trial/Trial.cs
index 1312b3857..f0c0f4eaf 100644
--- a/IRaCIS.Core.Domain/Trial/Trial.cs
+++ b/IRaCIS.Core.Domain/Trial/Trial.cs
@@ -256,7 +256,7 @@ public partial class Trial : BaseFullDeleteAuditEntity
/// 图像格式
///
[StringLength(2000)]
- public List ImageFormatList { get; set; } = new List();
+ public List ImageFormatList { get; set; } = new List() {"jpg","jpeg","png","bmp","pdf","zip" };
#endregion
#region 邮件配置