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

修改访视验证规则

Uat_Study
hang 2022-05-11 17:45:45 +08:00
parent f5a93d5699
commit 35bbef3a69
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IRaCIS.Core.Application/Service/ImageAndDoc/StudyListService.cs
View File

@ -390,8 +390,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
if (trialInfo.IsVerifyVisitImageDate) if (trialInfo.IsVerifyVisitImageDate)
{ {
//小于当前访视 最近的最早拍片日期 //小于当前访视 最近的最晚拍片
var before = visitList.Where(u => u.VisitNum < verifyInfo.VisitNum).Max(k => k.EarliestScanDate); var before = visitList.Where(u => u.VisitNum < verifyInfo.VisitNum).Max(k => k.LatestScanDate);
if (before != null && waitUploadItem.StudyDate !=null && before > waitUploadItem.StudyDate) if (before != null && waitUploadItem.StudyDate !=null && before > waitUploadItem.StudyDate)
{ {
@ -399,8 +399,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
return; return;
} }
//大于当前访视 最近的最晚拍片日期 //大于当前访视 最近的最早拍片日期
var after = visitList.Where(u => u.VisitNum > verifyInfo.VisitNum).Min(k => k.LatestScanDate); var after = visitList.Where(u => u.VisitNum > verifyInfo.VisitNum).Min(k => k.EarliestScanDate);
if (after != null && waitUploadItem.StudyDate != null && after < waitUploadItem.StudyDate) if (after != null && waitUploadItem.StudyDate != null && after < waitUploadItem.StudyDate)
{ {

10
IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs
View File

@ -88,9 +88,9 @@ namespace IRaCIS.Core.Application.Contracts
//更新验证的时候，排除自己 //更新验证的时候，排除自己
visitList = visitList.Where(t => t.Id != addOrEditNoneDicomStudy.Id).ToList(); visitList = visitList.Where(t => t.Id != addOrEditNoneDicomStudy.Id).ToList();
} }
//小于当前访视 最近的最早拍片日期 //小于当前访视 最近的最晚拍片
var before = visitList.Where(u => u.VisitNum < currentVisitNum).Max(k => k.EarliestScanDate); var before = visitList.Where(u => u.VisitNum < currentVisitNum).Max(k => k.LatestScanDate);
if (before != null && before > addOrEditNoneDicomStudy.ImageDate) if (before != null && before > addOrEditNoneDicomStudy.ImageDate)
{ {
@ -98,8 +98,8 @@ namespace IRaCIS.Core.Application.Contracts
} }
//大于当前访视 最近的最晚拍片日期 //大于当前访视 最近的最早拍片日期
var after = visitList.Where(u => u.VisitNum > currentVisitNum).Min(k => k.LatestScanDate); var after = visitList.Where(u => u.VisitNum > currentVisitNum).Min(k => k.EarliestScanDate);
if (after != null && after < addOrEditNoneDicomStudy.ImageDate) if (after != null && after < addOrEditNoneDicomStudy.ImageDate)
{ {