修改访视验证规则
parent
f5a93d5699
commit
35bbef3a69
|
@ -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)
|
||||||
{
|
{
|
||||||
|
|
|
@ -89,8 +89,8 @@ 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)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue