XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

非dicom 匿名图像 以及用户重置密码

Uat_IRC_Net10
hang 2026-06-29 14:36:55 +08:00
parent 88793cf011
commit 9fd7d9928a
13 changed files with 22658 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
IRaCIS.Core.Application/Helper/OtherTool/ImageHelper.cs
View File

@ -3,8 +3,11 @@ using FellowOakDicom.Imaging;
using SixLabors.ImageSharp;
using SixLabors.ImageSharp.Formats.Jpeg;
using SixLabors.ImageSharp.Processing;
using SixLabors.ImageSharp.PixelFormats;
using IRaCIS.Core.Application.Helper;
using SixLabors.ImageSharp.Drawing.Processing;
namespace IRaCIS.Core.Application.Helper;
public static class ImageHelper
{
@ -28,7 +31,7 @@ public static class ImageHelper
image.Save(fileStorePath, new JpegEncoder());
}
}
@ -60,6 +63,36 @@ public static class ImageHelper
}
public static class ImageMaskHelper
{
public static async Task MaskAsync(Stream input, Stream output, IEnumerable<MaskRegion> regions)
{
// 确保输入流从起始位置读取
if (input.CanSeek && input.Position != 0)
{
input.Position = 0;
}
using var image = await Image.LoadAsync(input);
// 保存原始图片的编码格式
var originalFormat = image.Metadata.DecodedImageFormat;
image.Mutate(ctx =>
{
foreach (var r in regions)
{
ctx.Fill(Color.White, new Rectangle(r.X, r.Y, r.Width, r.Height));
}
});
// 使用原始格式保存，保持格式不变
await image.SaveAsync(output, originalFormat);
}
}
}

1
IRaCIS.Core.Application/IRaCIS.Core.Application.csproj
View File

@ -61,6 +61,7 @@
<PackageReference Include="Panda.DynamicWebApi" Version="1.2.2" />
<PackageReference Include="RestSharp" Version="114.0.0" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.7" />
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="10.0.1" />
</ItemGroup>

15
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -18797,11 +18797,24 @@
NoneDicomStudyService
</summary>
</member>
<member name="M:IRaCIS.Core.Application.Contracts.NoneDicomStudyService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.NoneDicomStudy},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.NoneDicomStudyFile},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},Medallion.Threading.IDistributedLockProvider,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTask},IRaCIS.Core.Application.Service.QCCommon,AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
<member name="M:IRaCIS.Core.Application.Contracts.NoneDicomStudyService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.NoneDicomStudy},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.NoneDicomStudyFile},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},Medallion.Threading.IDistributedLockProvider,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTask},IRaCIS.Core.Application.Helper.IOSSService,IRaCIS.Core.Application.Service.QCCommon,AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
<summary>
NoneDicomStudyService
</summary>
</member>
<member name="M:IRaCIS.Core.Application.Contracts.NoneDicomStudyService.NoneDicomStudyMaskImage(IRaCIS.Core.Application.Contracts.NoneDicomStudyMaskImageCommand)">
<summary>
标注遮盖影像 路径后面加了.MaskNoneDicom_ 就是遮盖的新路径
</summary>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Contracts.NoneDicomStudyService.NoneDicomStudyUndoMaskImage(IRaCIS.Core.Application.Contracts.NoneDicomStudyUndoMaskImageCommand)">
<summary>
撤销遮盖的影像，可以单张，也可以整个检查
</summary>
<param name="inCommand"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Contracts.NoneDicomStudyService.GetNoneDicomStudyFileList(System.Guid)">
<summary>
非Dicom检查 文件列表

25
IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
View File

@ -749,6 +749,17 @@ namespace IRaCIS.Core.Application.Contracts
public long? FileSize { get; set; }
}
public class DownloadFileDto
{
public Guid Id { get; set; }
public string Path { get; set; }
public string FileName { get; set; }
public string FileType { get; set; }
}
public class DownloadNoneDicomStudyDto
{
public string Modality { get; set; }
@ -1164,6 +1175,20 @@ namespace IRaCIS.Core.Application.Contracts
public List<MaskRegion> MaskRegionList { get; set; }
}
public class NoneDicomStudyMaskImageCommand
{
public Guid? NodicomStudyId { get; set; }
public List<Guid>? NoneDicomStudyFileIdList { get; set; }
public List<MaskRegion> MaskRegionList { get; set; }
}
public class NoneDicomStudyUndoMaskImageCommand
{
public Guid? NodicomStudyId { get; set; }
public List<Guid>? NoneDicomStudyFileIdList { get; set; }
}
public class StudyUndoMaskImageCommand

169
IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs
View File

@ -3,10 +3,12 @@
// 生成时间 2021-12-06 10:54:55
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
//--------------------------------------------------------------------
using IRaCIS.Core.Application.Helper;
using IRaCIS.Core.Infrastructure;
using Medallion.Threading;
using Microsoft.AspNetCore.Mvc;
using System.ComponentModel.DataAnnotations;
using static ImageHelper;
namespace IRaCIS.Core.Application.Contracts
{
@ -19,11 +21,176 @@ namespace IRaCIS.Core.Application.Contracts
IRepository<Trial> _trialRepository,
IDistributedLockProvider _distributedLockProvider,
IRepository<SubjectVisit> _subjectVisitRepository,
IRepository<VisitTask> _visitTaskRepository,
IRepository<VisitTask> _visitTaskRepository, IOSSService _oSSService,
QCCommon _qCCommon, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, INoneDicomStudyService
{
/// <summary>
/// 标注遮盖影像 路径后面加了.MaskNoneDicom_ 就是遮盖的新路径
/// </summary>
/// <returns></returns>
[HttpPost]
public async Task<IResponseOutput> NoneDicomStudyMaskImage(NoneDicomStudyMaskImageCommand inCommand)
{
if (inCommand.NodicomStudyId == null && inCommand.NoneDicomStudyFileIdList == null)
{
return ResponseOutput.NotOk("NodicomStudyId and NoneDicomStudyFileIdList can not both be null");
}
var idPathList = new List<DownloadFileDto>();
if (inCommand.NodicomStudyId == null && inCommand.NoneDicomStudyFileIdList != null)
{
idPathList = await _noneDicomStudyFileRepository.Where(t => inCommand.NoneDicomStudyFileIdList.Contains(t.Id)).ProjectTo<DownloadFileDto>(_mapper.ConfigurationProvider).ToListAsync();
}
else
{
idPathList = await _noneDicomStudyFileRepository.Where(t => inCommand.NodicomStudyId == t.NoneDicomStudyId).ProjectTo<DownloadFileDto>(_mapper.ConfigurationProvider).ToListAsync();
}
var errorList = new List<DownloadFileDto>();
var okList = new List<DownloadFileDto>();
var batchId = Guid.NewGuid();
foreach (var item in idPathList)
{
var path = item.Path;
try
{
// 1. 下载文件
using var inputStream = new MemoryStream();
await (await _oSSService.GetStreamFromOSSAsync(path)).CopyToAsync(inputStream);
inputStream.Position = 0;
// 2. 处理图片
using var outputStream = new MemoryStream();
await ImageMaskHelper.MaskAsync(inputStream, outputStream, inCommand.MaskRegionList);
outputStream.Position = 0;
var prefix = path.Substring(1, path.LastIndexOf('/') - 1);
//每次都用一个新的名字
var maskFileName = string.Empty;
if (path.Contains(".MaskNoneDicom_"))
{
//清理缓存的里面的遮盖图，多次遮盖同一张图时，清除缓存很重要
await _oSSService.DeleteFromPrefix(path, true); //清理缓存的里面的遮盖图，多次遮盖同一张图时，清除缓存很重要
//本身就是遮盖的图，那么就要要替换guid
var length = Guid.Empty.ToString().Length + ".MaskNoneDicom_".Length;
var restorePath = item.Path[..^length];
maskFileName = $"{Path.GetFileName(restorePath)}.MaskNoneDicom_{batchId}";
}
else
{
//没有遮盖的，直接加上.批次_MaskDicom
maskFileName = $"{Path.GetFileName(path)}.MaskNoneDicom_{batchId}";
}
await _oSSService.UploadToOSSAsync(outputStream, prefix, maskFileName, false);
var newPath = $"/{prefix}/{maskFileName}";
okList.Add(new DownloadFileDto() { Id = item.Id, Path = newPath });
await _noneDicomStudyFileRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Id, u => new NoneDicomStudyFile() { Path = newPath, IsMasked = true });
}
catch (Exception ex)
{
errorList.Add(new DownloadFileDto() { Id = item.Id, Path = path });
Log.Logger.Error(ex, $"NoneDicomStudyMaskImage Error for NoneDicomStudyFileIdList Path:{path} {ex.Message}");
}
}
await _noneDicomStudyFileRepository.SaveChangesAsync();
return ResponseOutput.Ok(new { OkList = okList, ErrorList = errorList });
}
/// <summary>
/// 撤销遮盖的影像，可以单张，也可以整个检查
/// </summary>
/// <param name="inCommand"></param>
/// <returns></returns>
[HttpPost]
public async Task<IResponseOutput> NoneDicomStudyUndoMaskImage(NoneDicomStudyUndoMaskImageCommand inCommand)
{
if (inCommand.NodicomStudyId == null && inCommand.NoneDicomStudyFileIdList == null)
{
return ResponseOutput.NotOk("NodicomStudyId and NoneDicomStudyFileIdList can not both be null");
}
var idPathList = new List<DownloadFileDto>();
if (inCommand.NodicomStudyId == null && inCommand.NoneDicomStudyFileIdList != null)
{
idPathList = await _noneDicomStudyFileRepository.Where(t => inCommand.NoneDicomStudyFileIdList.Contains(t.Id)).ProjectTo<DownloadFileDto>(_mapper.ConfigurationProvider).ToListAsync();
}
else
{
idPathList = await _noneDicomStudyFileRepository.Where(t => inCommand.NodicomStudyId == t.NoneDicomStudyId).ProjectTo<DownloadFileDto>(_mapper.ConfigurationProvider).ToListAsync();
}
var okList = new List<DownloadFileDto>();
foreach (var item in idPathList)
{
if (item.Path.Contains(".MaskNoneDicom_"))
{
await _oSSService.DeleteFromPrefix(item.Path, true);
var length = Guid.Empty.ToString().Length + ".MaskNoneDicom_".Length;
var newPath = item.Path[..^length];
okList.Add(new DownloadFileDto() { Id = item.Id, Path = newPath });
await _noneDicomStudyFileRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Id, u => new NoneDicomStudyFile() { Path = newPath, IsMasked = false });
}
//if (item.Path.EndsWith("."))
//{
// await _oSSService.DeleteFromPrefix(item.Path, true);
// var newPath = item.Path[..^1];
// okList.Add(new InstanceIdPath() { Id = item.Id, Path = newPath });
// await _dicomInstanceRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Id, u => new DicomInstance() { Path = newPath, IsMasked = false });
//}
}
await _noneDicomStudyFileRepository.SaveChangesAsync();
return ResponseOutput.Ok(new { OkList = okList });
}
[HttpGet]
public async Task<IResponseOutput<List<NoneDicomStudyView>>> GetNoneDicomStudyList(

5
IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs
View File

@ -187,8 +187,13 @@ namespace IRaCIS.Core.Application.Service
CreateMap<DicomInstance, DownloadDicomInstanceDto>()
.ForMember(d => d.InstanceId, u => u.MapFrom(s => s.Id));
CreateMap<NoneDicomStudyFile, DownloadFileDto>();
}
}

4
IRaCIS.Core.Application/Service/Management/UserService.cs
View File

@ -301,7 +301,7 @@ namespace IRaCIS.Core.Application.Service
await _identityUserRepository.UpdatePartialFromQueryAsync(t => t.Id == identityUserId, u => new IdentityUser()
{
Password = MD5Helper.Md5(pwd),
IsFirstAdd = true
IsNeedResetPwd = true
});
var userName = _identityUserRepository.Where(t => t.Id == identityUserId).Select(t => t.UserName).FirstOrDefault();
@ -489,7 +489,7 @@ namespace IRaCIS.Core.Application.Service
{
Password = editPwModel.NewPassWord,
LastChangePassWordTime = DateTime.Now,
IsFirstAdd = false
IsNeedResetPwd = false
});
await _userPassWordLogRepository.AddAsync(new UserPassWordLog()

2
IRaCIS.Core.Domain/Image/NoneDicomStudyFile.cs
View File

@ -37,6 +37,8 @@ public class NoneDicomStudyFile : BaseAddDeleteAuditEntity
public bool IsReading { get; set; } = true;
public bool IsMasked { get; set; }
#region 跟任务绑定 同时区分检查
public Guid? VisitTaskId { get; set; }

2
IRaCIS.Core.Domain/Management/User.cs
View File

@ -125,6 +125,8 @@ public class IdentityUser : BaseFullAuditEntity
[Comment("首次登录需要修改密码")]
public bool IsFirstAdd { get; set; } = true;
public bool IsNeedResetPwd { get; set; }
public bool IsTestUser { get; set; }
[Comment("内部用户 外部用户")]

3
IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj
View File

@ -1,13 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<OutputPath>..\bin</OutputPath>
<NoWarn>$(NoWarn);NU1903</NoWarn>
</PropertyGroup>
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\IRaCIS.Core.Domain\IRaCIS.Core.Domain.csproj" />
<ProjectReference Include="..\IRaCIS.Core.Infrastructure\IRaCIS.Core.Infrastructure.csproj" />

22356
IRaCIS.Core.Infra.EFCore/Migrations/20260629063503_nonedicomMask.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

40
IRaCIS.Core.Infra.EFCore/Migrations/20260629063503_nonedicomMask.cs Normal file
View File

@ -0,0 +1,40 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace IRaCIS.Core.Infra.EFCore.Migrations
{
/// <inheritdoc />
public partial class nonedicomMask : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<bool>(
name: "IsMasked",
table: "NoneDicomStudyFile",
type: "bit",
nullable: false,
defaultValue: false);
migrationBuilder.AddColumn<bool>(
name: "IsNeedResetPwd",
table: "IdentityUser",
type: "bit",
nullable: false,
defaultValue: false);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "IsMasked",
table: "NoneDicomStudyFile");
migrationBuilder.DropColumn(
name: "IsNeedResetPwd",
table: "IdentityUser");
}
}
}

6
IRaCIS.Core.Infra.EFCore/Migrations/IRaCISDBContextModelSnapshot.cs
View File

@ -3600,6 +3600,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
.HasColumnType("bit")
.HasComment("首次登录需要修改密码");
b.Property<bool>("IsNeedResetPwd")
.HasColumnType("bit");
b.Property<bool>("IsTestUser")
.HasColumnType("bit");
@ -4116,6 +4119,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
b.Property<bool>("IsDeleted")
.HasColumnType("bit");
b.Property<bool>("IsMasked")
.HasColumnType("bit");
b.Property<bool>("IsReading")
.HasColumnType("bit");