增加检查数量字段
continuous-integration/drone/push Build is passing Details

Test_HIR_Net8
hang 2025-11-24 16:23:55 +08:00
parent efbaae2a97
commit 763984ca62
6 changed files with 19276 additions and 1 deletions

View File

@ -3442,6 +3442,7 @@ namespace IRaCIS.Application.Services
Id = NewId.NextSequentialGuid(), Id = NewId.NextSequentialGuid(),
IP = _userInfo.IP, IP = _userInfo.IP,
DownloadStartTime = DateTime.Now, DownloadStartTime = DateTime.Now,
StudyCount= patientList.SelectMany(t => t.StudyList).Count(),
ImageCount = patientList.SelectMany(t => t.StudyList).Sum(s => s.SeriesList.Sum(s => s.InstanceList.Count())), ImageCount = patientList.SelectMany(t => t.StudyList).Sum(s => s.SeriesList.Sum(s => s.InstanceList.Count())),
ImageSize = patientList.SelectMany(t => t.StudyList).Sum(t => t.SeriesList.Sum(s => s.InstanceList.Sum(i => i.FileSize))) ?? 0 ImageSize = patientList.SelectMany(t => t.StudyList).Sum(t => t.SeriesList.Sum(s => s.InstanceList.Sum(i => i.FileSize))) ?? 0
}; };
@ -3591,6 +3592,7 @@ namespace IRaCIS.Application.Services
IP = _userInfo.IP, IP = _userInfo.IP,
SubjectVisitId = subjectVisitId, SubjectVisitId = subjectVisitId,
DownloadStartTime = DateTime.Now, DownloadStartTime = DateTime.Now,
StudyCount = result.StudyList.Count(),
ImageCount = result.StudyList.Sum(s => s.SeriesList.Sum(s => s.InstanceList.Count())), ImageCount = result.StudyList.Sum(s => s.SeriesList.Sum(s => s.InstanceList.Count())),
ImageSize = result.StudyList.Sum(t => t.SeriesList.Sum(s => s.InstanceList.Sum(i => i.FileSize))) ?? 0 ImageSize = result.StudyList.Sum(t => t.SeriesList.Sum(s => s.InstanceList.Sum(i => i.FileSize))) ?? 0
}; };

View File

@ -27,7 +27,6 @@ namespace IRaCIS.Core.Application.Service
.ForMember(d => d.VisitName, u => u.MapFrom(s => s.SubjectVisit.VisitName)) .ForMember(d => d.VisitName, u => u.MapFrom(s => s.SubjectVisit.VisitName))
.ForMember(d => d.DownloadTime, u => u.MapFrom(s => s.CreateTime)) .ForMember(d => d.DownloadTime, u => u.MapFrom(s => s.CreateTime))
.ForMember(d => d.DownloadUserName, u => u.MapFrom(s => s.CreateUserRole.UserName)) .ForMember(d => d.DownloadUserName, u => u.MapFrom(s => s.CreateUserRole.UserName))
.ForMember(d => d.StudyCount, u => u.MapFrom(s => s.SubjectVisit.StudyList.Count()))
.ForMember(d => d.DownLoadUserFullName, u => u.MapFrom(s => s.CreateUserRole.FullName)) .ForMember(d => d.DownLoadUserFullName, u => u.MapFrom(s => s.CreateUserRole.FullName))
.ForMember(d => d.UserTypeEnum, u => u.MapFrom(s => s.CreateUserRole.UserTypeEnum)); .ForMember(d => d.UserTypeEnum, u => u.MapFrom(s => s.CreateUserRole.UserTypeEnum));

View File

@ -37,7 +37,11 @@ namespace IRaCIS.Core.Domain.Models
public long ImageSize { get; set; } public long ImageSize { get; set; }
#region 患者层级 和检查下载 #region 患者层级 和检查下载
public int StudyCount { get; set; }
[MaxLength] [MaxLength]
public string DownLoadListStr { get; set; } public string DownLoadListStr { get; set; }
#endregion #endregion

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,29 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace IRaCIS.Core.Infra.EFCore.Migrations
{
/// <inheritdoc />
public partial class downloadStudyCount : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<int>(
name: "StudyCount",
table: "SubejctVisitDownload",
type: "int",
nullable: false,
defaultValue: 0);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "StudyCount",
table: "SubejctVisitDownload");
}
}
}

View File

@ -8719,6 +8719,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
b.Property<bool>("IsSuccess") b.Property<bool>("IsSuccess")
.HasColumnType("bit"); .HasColumnType("bit");
b.Property<int>("StudyCount")
.HasColumnType("int");
b.Property<Guid?>("SubjectVisitId") b.Property<Guid?>("SubjectVisitId")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");