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

项目dicom ae 修改
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-07-31 15:08:28 +08:00
parent d3f7c199c7
commit aae243e36e
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
IRaCIS.Core.Application/Service/TrialSiteUser/TrialDicomAEService.cs
View File

@ -76,6 +76,14 @@ namespace IRaCIS.Core.Application.Service
VerifyMsg = _localizer["TrialDicomAE_RepeatIPAndPort"]
};
var verifyExp2 = new EntityVerifyExp<TrialDicomAE>()
{
VerifyExp = u => u.IP == addOrEditDicomAE.CalledAE ,
//"AE名称不能与其他项目相同"
VerifyMsg = _localizer["TrialDicomAE_RepeatCalledAE"]
};
//var verifyExp2 = new EntityVerifyExp<TrialDicomAE>()
//{
// VerifyExp = u => u.TrialId == addOrEditDicomAE.TrialId,
@ -90,7 +98,7 @@ namespace IRaCIS.Core.Application.Service
if (addOrEditDicomAE.IsPACSConnect)
{
// 在此处拷贝automapper 映射
var entity = await _dicomAERepository.InsertOrUpdateAsync(addOrEditDicomAE, true, verifyExp1);
var entity = await _dicomAERepository.InsertOrUpdateAsync(addOrEditDicomAE, true, verifyExp1, verifyExp2);
return ResponseOutput.Ok(entity.Id.ToString());
}

2
IRaCIS.Core.Application/Service/Visit/DTO/PatientViewModel.cs
View File

@ -954,6 +954,8 @@ namespace IRaCIS.Application.Contracts
public class SCPImageUploadQuery : PageInput
{
[NotDefault]
public Guid TrialId { get; set; }
public string TrialSiteKeyInfo { get; set; }
public string? CallingAE { get; set; }

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

@ -75,7 +75,7 @@ namespace IRaCIS.Application.Services
[HttpPost]
public async Task<IResponseOutput<PageOutput<SCPImageUploadView>>> GetSCPImageUploadList(SCPImageUploadQuery inQuery)
{
var query = _repository.Where<SCPImageUpload>()
var query = _repository.Where<SCPImageUpload>(t=>t.TrialId==inQuery.TrialId)
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.CalledAE), t => t.CalledAE.Contains(inQuery.CalledAE))
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.CallingAEIP), t => t.CallingAEIP.Contains(inQuery.CallingAEIP))
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.CallingAE), t => t.CallingAE.Contains(inQuery.CallingAE))