Compare commits

..

No commits in common. "4d206ebf9d8d657e91b9ac1f73624ea31b17865d" and "0bc0421ee3f6e704fe96cb0617a38907f3b45fc3" have entirely different histories.

1 changed files with 3 additions and 3 deletions

View File

@ -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,
VisitTaskId=(Guid?)t.VisitTaskId 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?)null VisitTaskId = Guid.Empty
}).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 != null && findStudy.VisitTaskId != inCommand.VisitTaskId) if (inCommand.VisitTaskId != null && findStudy.VisitTaskId != Guid.Empty && findStudy.VisitTaskId != inCommand.VisitTaskId)
{ {
result.Add(new TaskStudyArchiveConfirmResult() { StudyInstanceUid = studyUid, IsAllowReUpload = false, IsAllowUpload = false }); result.Add(new TaskStudyArchiveConfirmResult() { StudyInstanceUid = studyUid, IsAllowReUpload = false, IsAllowUpload = false });
} }