XCKJ/EI-Image-Viewer-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
hang
2023-04-18 15:52:47 +08:00
parent 96418613dd
commit 469a2e7362
131 changed files with 1544 additions and 1262 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/ImageAndDoc/ImageShareService.cs
+1 -1
View File
@@ -32,7 +32,7 @@ namespace IRaCIS.Core.Application.Services
if (imageShareCommand.StudyId == null)
{
#region 上传不按照访视上传，基线没传，数据可能出错
#region 上传不按照检查批次上传，基线没传，数据可能出错
//var subjectVisit1 = _subjectVisitRepository.FirstOrDefault(t =>
// t.TrialId == imageShareCommand.TrialId && t.SubjectId == imageShareCommand.SubjectId &&
IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs
+10 -10
View File
@@ -345,8 +345,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
/// <summary>
/// 获取某个检查的关联检查列表（该受试者在这个想项目下的所有检查）
/// 点击检查检查列表中的一个检查获取对应的序列列表（调用之前的接口：/series/list/，根据StudyId，获取访视的序列列表）
/// 获取某个检查的关联检查列表（该患者在这个想项目下的所有检查）
/// 点击检查检查列表中的一个检查获取对应的序列列表（调用之前的接口：/series/list/，根据StudyId，获取检查批次的序列列表）
/// </summary>
/// <returns></returns>
[HttpGet("{subjectVisitId:guid}")]
@@ -418,21 +418,21 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
if (trialInfo.IsVerifyVisitImageDate)
{
//小于当前访视 最近的最晚拍片
//小于当前检查批次 最近的最晚拍片
var before = visitList.Where(u => u.VisitNum < verifyInfo.VisitNum).Max(k => k.LatestScanDate);
if (before != null && waitUploadItem.StudyDate != null && before > waitUploadItem.StudyDate)
{
result.Add(new VerifyStudyUploadResult() { ErrorMesseage = $"当前访视检查时间{waitUploadItem.StudyDate?.ToString("yyyy-MM-dd")}不能早于前序访视检查时间{before?.ToString("yyyy-MM-dd")}，请核对检查数据是否有误", StudyInstanceUid = waitUploadItem.StudyInstanceUid });
result.Add(new VerifyStudyUploadResult() { ErrorMesseage = $"当前检查批次检查时间{waitUploadItem.StudyDate?.ToString("yyyy-MM-dd")}不能早于前序检查批次检查时间{before?.ToString("yyyy-MM-dd")}，请核对检查数据是否有误", StudyInstanceUid = waitUploadItem.StudyInstanceUid });
return;
}
//大于当前访视 最近的最早拍片日期
//大于当前检查批次 最近的最早拍片日期
var after = visitList.Where(u => u.VisitNum > verifyInfo.VisitNum).Min(k => k.EarliestScanDate);
if (after != null && waitUploadItem.StudyDate != null && after < waitUploadItem.StudyDate)
{
result.Add(new VerifyStudyUploadResult() { ErrorMesseage = $"当前访视检查时间{waitUploadItem.StudyDate?.ToString("yyyy-MM-dd")}不能晚于该访视之后的检查时间{after?.ToString("yyyy-MM-dd")}，请核对检查数据是否有误", StudyInstanceUid = waitUploadItem.StudyInstanceUid });
result.Add(new VerifyStudyUploadResult() { ErrorMesseage = $"当前检查批次检查时间{waitUploadItem.StudyDate?.ToString("yyyy-MM-dd")}不能晚于该检查批次之后的检查时间{after?.ToString("yyyy-MM-dd")}，请核对检查数据是否有误", StudyInstanceUid = waitUploadItem.StudyInstanceUid });
return;
}
}
@@ -468,7 +468,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
result.AllowReUpload = false;
result.StudyInstanceUid = studyInstanceUid;
result.ErrorMesseage = "受试者访视结束，不允许上传!";
result.ErrorMesseage = "患者检查批次结束，不允许上传!";
return result;
}
@@ -489,12 +489,12 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
//数据库该项目有该检查 看是否支持重传
else
{
//是同一个受试者 支持重传
//是同一个患者 支持重传
if (verifyStudyInfo.SubjectId == SubjectId && verifyStudyInfo.SubjectVisitId == currentSubjectVisitId)
{
result.AllowReUpload = true;
}
//不是同一个受试者
//不是同一个患者
else
{
//有默认值，其实不用写，这里为了好理解
@@ -502,7 +502,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
result.AllowReUpload = false;
result.ErrorMesseage = $"此处不可以上传。当前影像检查已经上传给受试者{verifyStudyInfo.SubjectCode}的{verifyStudyInfo.VisitName}";
result.ErrorMesseage = $"此处不可以上传。当前影像检查已经上传给患者{verifyStudyInfo.SubjectCode}的{verifyStudyInfo.VisitName}";
}
}
result.StudyInstanceUid = studyInstanceUid;