Compare commits

..

No commits in common. "011a75714e625c2a10ed1d2a14ed60b3bc36f9d1" and "006d1bd167004ef6b3949e97d74547907be5b3d7" have entirely different histories.

3 changed files with 11 additions and 18 deletions

View File

@ -279,7 +279,7 @@ namespace IRaCIS.Core.Application.Service
[UnitOfWork] [UnitOfWork]
public async Task<IResponseOutput> ResetPassword(Guid userId) public async Task<IResponseOutput> ResetPassword(Guid userId)
{ {
var hospitalInfo = await _fusionCache.GetOrSetAsync(CacheKeys.Hospital, async _ => await CacheHelper.GetHospitalCode(_hirHospitalRepository), TimeSpan.FromDays(7)); var hospitalInfo = await _fusionCache.GetOrSetAsync(CacheKeys.Hospital,async _ => await CacheHelper.GetHospitalCode(_hirHospitalRepository), TimeSpan.FromDays(7));
//var pwd = IRCEmailPasswordHelper.GenerateRandomPassword(10); //var pwd = IRCEmailPasswordHelper.GenerateRandomPassword(10);
@ -435,11 +435,8 @@ namespace IRaCIS.Core.Application.Service
{ {
var hospitalInfo = await _fusionCache.GetOrSetAsync(CacheKeys.Hospital, async _ => await CacheHelper.GetHospitalCode(_hirHospitalRepository), TimeSpan.FromDays(7)); var hospitalInfo = await _fusionCache.GetOrSetAsync(CacheKeys.Hospital, async _ => await CacheHelper.GetHospitalCode(_hirHospitalRepository), TimeSpan.FromDays(7));
if (userAddModel.UserName.IsNotNullOrEmpty())
{
await VerifyUserNameAsync(null, userAddModel.UserName);
} await VerifyUserNameAsync(null, userAddModel.UserName);
await VerifyUserEmailAsync(null, userAddModel.UserTypeId, userAddModel.EMail); await VerifyUserEmailAsync(null, userAddModel.UserTypeId, userAddModel.EMail);

View File

@ -13,7 +13,6 @@ using FellowOakDicom.Network;
using IRaCIS.Application.Contracts; using IRaCIS.Application.Contracts;
using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share;
using IRaCIS.Core.Infrastructure; using IRaCIS.Core.Infrastructure;
using FellowOakDicom;
namespace IRaCIS.Core.Application.Service namespace IRaCIS.Core.Application.Service
{ {
/// <summary> /// <summary>
@ -106,13 +105,13 @@ namespace IRaCIS.Core.Application.Service
client.NegotiateAsyncOps(); client.NegotiateAsyncOps();
client.ServiceOptions.RequestTimeout = TimeSpan.FromSeconds(5); client.ServiceOptions.RequestTimeout = TimeSpan.FromSeconds(3);
var request = new DicomCFindRequest(DicomQueryRetrieveLevel.Study) var request = new DicomCEchoRequest
{ {
OnResponseReceived = (req, response) => OnResponseReceived = (req, response) =>
{ {
//Console.WriteLine($"C-Find Response: {response.Status}"); Console.WriteLine($"C-ECHO Response: {response.Status}");
if (response.Status == DicomStatus.Success) if (response.Status == DicomStatus.Success)
{ {
@ -125,9 +124,6 @@ namespace IRaCIS.Core.Application.Service
} }
}; };
// 设置你要查询的条件(比如 PatientID
request.Dataset.Add(DicomTag.PatientID, "TEST123");
await client.AddRequestAsync(request); await client.AddRequestAsync(request);

View File

@ -3043,10 +3043,10 @@ namespace IRaCIS.Application.Services
if (find != null) if (find != null)
{ {
//测试失败 //测试失败
//if (!CEchoTest(find, hirClient.CalledAE)) if (!CEchoTest(find, hirClient.CalledAE))
//{ {
// throw new BusinessValidationFailedException(_localizer["Patient_PacsAENotOnline"]); throw new BusinessValidationFailedException(_localizer["Patient_PacsAENotOnline"]);
//} }
var @lock = _distributedLockProvider.CreateLock($"CFind"); var @lock = _distributedLockProvider.CreateLock($"CFind");