From 425bd7bf9ad47876bd7198631225ede854bf0b17 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 17 Jul 2024 14:44:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IRaCIS.Core.Application.xml | 13 ++++++++++++ .../Service/Visit/DTO/PatientViewModel.cs | 21 +++++++++++++++++-- .../Service/Visit/PatientService.cs | 5 +++++ 3 files changed, 37 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 3eebc5573..0be0d769e 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -14621,6 +14621,19 @@ + + + 清除跳过阅片的缓存 + + + + + + 设置跳过阅片的缓存 + + + + 获取下一个阅片任务 diff --git a/IRaCIS.Core.Application/Service/Visit/DTO/PatientViewModel.cs b/IRaCIS.Core.Application/Service/Visit/DTO/PatientViewModel.cs index 5acd1f0bb..f3c8d4a72 100644 --- a/IRaCIS.Core.Application/Service/Visit/DTO/PatientViewModel.cs +++ b/IRaCIS.Core.Application/Service/Visit/DTO/PatientViewModel.cs @@ -1051,16 +1051,33 @@ namespace IRaCIS.Application.Contracts public string CallingAE { get; set; } = string.Empty; + public string BodyPartExamined { get; set; } = string.Empty; + public string PatientIdStr { get; set; } = string.Empty; public string PatientName { get; set; } = string.Empty; public string PatientAge { get; set; } = string.Empty; public string PatientSex { get; set; } = string.Empty; + + public string PatientBirthDate { get; set; } = string.Empty; } - public class PatientStudySimpleView: VisitPatientStudyFilterView + public class PatientStudySimpleView { - + public Guid SCPStudyId { get; set; } + + public Guid PatientId { get; set; } + + public DateTime? StudyTime { get; set; } + public string Modalities { get; set; } = string.Empty; + + public string Description { get; set; } = string.Empty; + public int SeriesCount { get; set; } = 0; + public int InstanceCount { get; set; } = 0; + + public string CalledAE { get; set; } = string.Empty; + + public string CallingAE { get; set; } = string.Empty; public Guid? SubjectVisitId { get; set; } public string? VisitName { get; set; } diff --git a/IRaCIS.Core.Application/Service/Visit/PatientService.cs b/IRaCIS.Core.Application/Service/Visit/PatientService.cs index 6cb4ab6d4..dc49fe0ad 100644 --- a/IRaCIS.Core.Application/Service/Visit/PatientService.cs +++ b/IRaCIS.Core.Application/Service/Visit/PatientService.cs @@ -192,6 +192,9 @@ namespace IRaCIS.Application.Services SCPStudyId = scpStudy.Id, SeriesCount = scpStudy.SeriesCount, StudyTime = scpStudy.StudyTime, + + + SubjectVisitId = scpStudy.SubjectVisitId, VisitName = scpStudy.SubjectVisit.VisitName, @@ -262,7 +265,9 @@ namespace IRaCIS.Application.Services SCPStudyId = scpStudy.Id, SeriesCount = scpStudy.SeriesCount, StudyTime = scpStudy.StudyTime, + BodyPartExamined=scpStudy.BodyPartExamined, + PatientBirthDate=scpStudy.PatientBirthDate, PatientAge = scpStudy.PatientAge, PatientIdStr = scpStudy.PatientIdStr, PatientName = scpStudy.PatientName,