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

tj cmove 检查
continuous-integration/drone/push Build is passing Details

Test_HIR_Net8
hang 2025-04-02 10:01:33 +08:00
parent 65369c73bf
commit a91705b35d
4 changed files with 117 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17998,6 +17998,16 @@
数据 数据
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Application.Contracts.TJCmoveStudyCommand.StudyInstanceUIDList">
<summary>
C-move 检查 数组
</summary>
</member>
<member name="P:IRaCIS.Application.Contracts.TJCmoveStudyCommand.CalledAE">
<summary>
PacsAE 的名字
</summary>
</member>
<member name="T:IRaCIS.Application.Contracts.WorkLoadDetailDTO"> <member name="T:IRaCIS.Application.Contracts.WorkLoadDetailDTO">
<summary> <summary>
后台 工作量审核视图模型 后台 工作量审核视图模型
@ -18539,14 +18549,18 @@
<param name="inCommand"></param> <param name="inCommand"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Application.Services.PatientService.CmoveStudyList(IRaCIS.Application.Contracts.SCUCmoveCommand,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomAE},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SCPInstance},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.ServiceVerifyConfigOption})"> <member name="M:IRaCIS.Application.Services.PatientService.CmoveStudyList(IRaCIS.Application.Contracts.SCUCmoveCommand)">
<summary> <summary>
拉取影像 拉取影像
</summary> </summary>
<param name="inCommand"></param> <param name="inCommand"></param>
<param name="_dicomAEReposiotry"></param> <returns></returns>
<param name="_scpInstanceRepository"></param> </member>
<param name="_basicSystemConfigConfig"></param> <member name="M:IRaCIS.Application.Services.PatientService.TjCmoveStudy(IRaCIS.Application.Contracts.TJCmoveStudyCommand)">
<summary>
同济医院 第三方系统 发送命令拉取影像
</summary>
<param name="inCommand"></param>
<returns></returns> <returns></returns>
</member> </member>
</members> </members>

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

@ -648,40 +648,40 @@ namespace IRaCIS.Core.Application.Service
//本地测试地址接口 //本地测试地址接口
//var apiUrl = "http://192.168.40.88:8080/dock/userinfo"; var apiUrl = "http://192.168.40.88:8080/dock/userinfo";
//var headers = new Dictionary<string, string> var headers = new Dictionary<string, string>
//{ {
// { "Content-Type", "application/json" } // 根据需要添加其他头部信息 { "Content-Type", "application/json" } // 根据需要添加其他头部信息
//}; };
//var requestData = new var requestData = new
//{ {
// token = token, token = token,
// appId = "third-hirs", appId = "third-hirs",
//}; };
//var tjUserInfo = await RestClientAPI.PostAsync<TJUserInfoDto>(apiUrl, requestData, headers); var tjUserInfo = await RestClientAPI.PostAsync<TJUserInfoDto>(apiUrl, requestData, headers);
#endregion #endregion
#region 测试数据 #region 测试数据
var tjUserInfo = new TJUserInfoDto //var tjUserInfo = new TJUserInfoDto
{ //{
Code = "200", // Code = "200",
Msg = "操作成功", // Msg = "操作成功",
Success = true, // Success = true,
Data = new TJUserInfoData // Data = new TJUserInfoData
{ // {
UserCode = "YS10138", // UserCode = "YS10138",
UserName = "胡学梅", // UserName = "胡学梅",
DeptCode = "2121", // DeptCode = "2121",
Sex = "未知", // Sex = "未知",
Birthday = "", // Birthday = "",
Title = "", // Title = "",
UserType = "doctor", // UserType = "doctor",
Roles = new List<string> { "pm", "crc" } // Roles = new List<string> { "pm", "crc" }
} // }
}; //};
#endregion #endregion

15
IRaCIS.Core.Application/Service/Visit/DTO/SCUClientViewModel.cs
View File

@ -61,4 +61,19 @@ namespace IRaCIS.Application.Contracts
public string? ModalitiesInStudy { get; set; } public string? ModalitiesInStudy { get; set; }
} }
public class TJCmoveStudyCommand
{
public string Token { get; set; }
/// <summary>
/// C-move 检查 数组
/// </summary>
public List<string> StudyInstanceUIDList { get; set; }
/// <summary>
///PacsAE 的名字
/// </summary>
public string CalledAE { get; set; }
}
} }

64
IRaCIS.Core.Application/Service/Visit/PatientService.cs
View File

@ -52,6 +52,7 @@ using IRaCIS.Core.Infra.EFCore.Migrations;
using System.Dynamic; using System.Dynamic;
using System.Threading.Channels; using System.Threading.Channels;
using NPOI.HSSF.Record.Chart; using NPOI.HSSF.Record.Chart;
using IRaCIS.Core.Application.Helper.OtherTool;
namespace IRaCIS.Application.Services namespace IRaCIS.Application.Services
@ -68,6 +69,9 @@ namespace IRaCIS.Application.Services
IRepository<SCPImageUpload> _SCPImageUploadRepository, IRepository<SCPImageUpload> _SCPImageUploadRepository,
IRepository<User> _userRepository, IRepository<User> _userRepository,
IRepository<HIRHospital> _hIRHospitalRepository, IRepository<HIRHospital> _hIRHospitalRepository,
IRepository<DicomAE> _dicomAEReposiotry,
IRepository<SCPInstance> _scpInstanceRepository,
IOptionsMonitor<ServiceVerifyConfigOption> _basicSystemConfigConfig,
ILogger<PatientService> _logger, ILogger<PatientService> _logger,
IDistributedLockProvider _distributedLockProvider, IMapper _mapper, IUserInfo _userInfo, IWebHostEnvironment _hostEnvironment, IStringLocalizer _localizer, IFusionCache _fusionCache IDistributedLockProvider _distributedLockProvider, IMapper _mapper, IUserInfo _userInfo, IWebHostEnvironment _hostEnvironment, IStringLocalizer _localizer, IFusionCache _fusionCache
@ -385,7 +389,7 @@ namespace IRaCIS.Application.Services
var query = _hIRHospitalRepository.Where(t => t.IsDefault == true).ProjectTo<HIRHospitalView>(_mapper.ConfigurationProvider); var query = _hIRHospitalRepository.Where(t => t.IsDefault == true).ProjectTo<HIRHospitalView>(_mapper.ConfigurationProvider);
var hospitalInfo= await query.FirstNotNullAsync(); var hospitalInfo = await query.FirstNotNullAsync();
var trialInfo = _trialRepository.Where(t => t.Id == trialId, ignoreQueryFilters: true).FirstOrDefault(); var trialInfo = _trialRepository.Where(t => t.Id == trialId, ignoreQueryFilters: true).FirstOrDefault();
@ -3308,14 +3312,8 @@ namespace IRaCIS.Application.Services
/// 拉取影像 /// 拉取影像
/// </summary> /// </summary>
/// <param name="inCommand"></param> /// <param name="inCommand"></param>
/// <param name="_dicomAEReposiotry"></param>
/// <param name="_scpInstanceRepository"></param>
/// <param name="_basicSystemConfigConfig"></param>
/// <returns></returns> /// <returns></returns>
public async Task<IResponseOutput> CmoveStudyList(SCUCmoveCommand inCommand, public async Task<IResponseOutput> CmoveStudyList(SCUCmoveCommand inCommand)
[FromServices] IRepository<DicomAE> _dicomAEReposiotry,
[FromServices] IRepository<SCPInstance> _scpInstanceRepository,
[FromServices] IOptionsMonitor<ServiceVerifyConfigOption> _basicSystemConfigConfig)
{ {
var result = new List<SCUStudyView>(); var result = new List<SCUStudyView>();
@ -3407,7 +3405,57 @@ namespace IRaCIS.Application.Services
} }
/// <summary>
/// 同济医院 第三方系统 发送命令拉取影像
/// </summary>
/// <param name="inCommand"></param>
/// <returns></returns>
[HttpPost]
[AllowAnonymous]
public async Task<IResponseOutput> TjCmoveStudy(TJCmoveStudyCommand inCommand)
{
var apiUrl = "http://192.168.40.88:8080/dock/userinfo";
var headers = new Dictionary<string, string>
{
{ "Content-Type", "application/json" } // 根据需要添加其他头部信息
};
var requestData = new
{
token = inCommand.Token,
appId = "third-hirs",
};
var tjUserInfo = await RestClientAPI.PostAsync<TJUserInfoDto>(apiUrl, requestData, headers);
if (tjUserInfo != null && tjUserInfo.Data?.Roles != null &&
tjUserInfo.Data.Roles.Any(role => string.Equals("PM", role, StringComparison.OrdinalIgnoreCase)))
{
var find = await _dicomAEReposiotry.FirstOrDefaultAsync(t => t.CalledAE == inCommand.CalledAE && t.PacsTypeEnum == PacsType.PacsServer);
if (find == null)
{
return ResponseOutput.NotOk($"{inCommand.CalledAE}在系统中未配置，请联系维护人员核查");
}
else
{
var cmoveCommand = new SCUCmoveCommand() { PacsDicomAEId = find.Id, StudyInstanceUIDList = inCommand.StudyInstanceUIDList };
return await CmoveStudyList(cmoveCommand);
}
}
else
{
return ResponseOutput.NotOk("未获取到该用户信息或者该用户token 不包含PM 角色");
}
}
#endregion #endregion