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

修改Dicom 推送
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-07-23 10:35:38 +08:00
parent 3fab377454
commit fc36cbcb75
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRC.Core.SCP/Service/CStoreSCPService.cs
View File

@ -115,7 +115,7 @@ namespace IRaCIS.Core.SCP.Service
var _trialSiteDicomAERepository = _serviceProvider.GetService<IRepository<TrialSiteDicomAE>>(); var _trialSiteDicomAERepository = _serviceProvider.GetService<IRepository<TrialSiteDicomAE>>();
var findTrialSiteAE = _trialSiteDicomAERepository.Where(t => t.CallingAE == association.CallingAE).FirstOrDefault(); var findTrialSiteAE = _trialSiteDicomAERepository.Where(t => t.CallingAE == association.CallingAE && t.TrialId==_trialId).FirstOrDefault();
if (findTrialSiteAE != null) if (findTrialSiteAE != null)
{ {

14
IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteDicomAEService.cs
View File

@ -51,13 +51,21 @@ namespace IRaCIS.Core.Application.Service
{ {
var verifyExp1 = new EntityVerifyExp<TrialSiteDicomAE>() var verifyExp1 = new EntityVerifyExp<TrialSiteDicomAE>()
{ {
VerifyExp = u => u.IP == addOrEditTrialSiteDicomAE.IP && u.Port == addOrEditTrialSiteDicomAE.Port &&u.CallingAE==addOrEditTrialSiteDicomAE.CallingAE && u.TrialId == addOrEditTrialSiteDicomAE.TrialId, VerifyExp = u => u.IP == addOrEditTrialSiteDicomAE.IP && u.Port == addOrEditTrialSiteDicomAE.Port
&& u.CallingAE == addOrEditTrialSiteDicomAE.CallingAE && u.TrialId == addOrEditTrialSiteDicomAE.TrialId
&& u.TrialSiteId == addOrEditTrialSiteDicomAE.TrialSiteId,
VerifyMsg = "不允许添加相同的IP和端口的记录" VerifyMsg = "不允许添加相同的记录"
};
var verifyExp2 = new EntityVerifyExp<TrialSiteDicomAE>()
{
VerifyExp = u => u.CallingAE == addOrEditTrialSiteDicomAE.CallingAE && u.TrialId == addOrEditTrialSiteDicomAE.TrialId && u.TrialSiteId!=addOrEditTrialSiteDicomAE.TrialSiteId,
VerifyMsg = "其他中心已有该CallingAE"
}; };
var entity = await _trialSiteDicomAERepository.InsertOrUpdateAsync(addOrEditTrialSiteDicomAE, true, verifyExp1); var entity = await _trialSiteDicomAERepository.InsertOrUpdateAsync(addOrEditTrialSiteDicomAE, true, verifyExp1, verifyExp2);
return ResponseOutput.Ok(entity.Id.ToString()); return ResponseOutput.Ok(entity.Id.ToString());