修改报错
parent
50a45e2260
commit
9c4ada3e66
|
@ -259,7 +259,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
|
||||||
t.StudyInstanceUid,
|
t.StudyInstanceUid,
|
||||||
t.SubjectId,
|
t.SubjectId,
|
||||||
SubejectCode = t.VisitTask.IsAnalysisCreate ? t.VisitTask.BlindSubjectCode : t.Subject.Code,
|
SubejectCode = t.VisitTask.IsAnalysisCreate ? t.VisitTask.BlindSubjectCode : t.Subject.Code,
|
||||||
t.VisitTaskId
|
VisitTaskId=(Guid?)t.VisitTaskId
|
||||||
}).ToList();
|
}).ToList();
|
||||||
|
|
||||||
var notAllowedUidList2 = _dicomStudyRepository.Where(t => t.TrialId == inCommand.TrialId && inCommand.StudyInstanceUidList.Contains(t.StudyInstanceUid)).Select(t => new
|
var notAllowedUidList2 = _dicomStudyRepository.Where(t => t.TrialId == inCommand.TrialId && inCommand.StudyInstanceUidList.Contains(t.StudyInstanceUid)).Select(t => new
|
||||||
|
@ -267,7 +267,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
|
||||||
t.StudyInstanceUid,
|
t.StudyInstanceUid,
|
||||||
t.SubjectId,
|
t.SubjectId,
|
||||||
SubejectCode = t.Subject.Code,
|
SubejectCode = t.Subject.Code,
|
||||||
VisitTaskId = Guid.Empty
|
VisitTaskId = (Guid?)null
|
||||||
}).ToList();
|
}).ToList();
|
||||||
|
|
||||||
var notAllowedUidList = notAllowedUidList1.Union(notAllowedUidList2);
|
var notAllowedUidList = notAllowedUidList1.Union(notAllowedUidList2);
|
||||||
|
@ -283,7 +283,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
|
||||||
//同一个subject 同一份影响
|
//同一个subject 同一份影响
|
||||||
if (findStudy.SubejectCode == inCommand.SubjectCode && findStudy.SubjectId == inCommand.SubjectId)
|
if (findStudy.SubejectCode == inCommand.SubjectCode && findStudy.SubjectId == inCommand.SubjectId)
|
||||||
{
|
{
|
||||||
if (inCommand.VisitTaskId != null && findStudy.VisitTaskId != Guid.Empty && findStudy.VisitTaskId != inCommand.VisitTaskId)
|
if (inCommand.VisitTaskId != null && findStudy.VisitTaskId != null && findStudy.VisitTaskId != inCommand.VisitTaskId)
|
||||||
{
|
{
|
||||||
result.Add(new TaskStudyArchiveConfirmResult() { StudyInstanceUid = studyUid, IsAllowReUpload = false, IsAllowUpload = false });
|
result.Add(new TaskStudyArchiveConfirmResult() { StudyInstanceUid = studyUid, IsAllowReUpload = false, IsAllowUpload = false });
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue