diff --git a/IRaCIS.Core.Application/TestService.cs b/IRaCIS.Core.Application/TestService.cs index caf6c12fd..34e6f3364 100644 --- a/IRaCIS.Core.Application/TestService.cs +++ b/IRaCIS.Core.Application/TestService.cs @@ -206,6 +206,14 @@ namespace IRaCIS.Core.Application.Service public Guid? SubjectVisitId { get; set; } public decimal VisitNum { get; set; } public string VisitName { get; set; } + + public string R1 { get; set; } + + public string R1阅片状态 { get; set; } + + public string R2 { get; set; } + + public string R2阅片状态 { get; set; } } [AllowAnonymous] @@ -231,76 +239,76 @@ namespace IRaCIS.Core.Application.Service string exportPath = @$"C:\Users\PC\Desktop\newDownload.xlsx"; - //MiniExcel.SaveAs(exportPath, downloadVisit); + MiniExcel.SaveAs(exportPath, downloadVisit); #region 数据库查询 - var downloadInfo = _trialRepository.Where(t => t.Id == trialId).Select(t => new - { - t.ResearchProgramNo, - t.TrialCode, +// var downloadInfo = _trialRepository.Where(t => t.Id == trialId).Select(t => new +// { +// t.ResearchProgramNo, +// t.TrialCode, - VisitList = t.SubjectVisitList.Where(t => t.VisitTaskList.Any(t => t.TaskState == TaskState.Effect && t.ReadingCategory == ReadingCategory.Visit && t.ReadingTaskState != ReadingTaskState.HaveSigned && t.SourceSubjectVisitId != null && t.DoctorUserId != null)) - //.Where(t=>subjectCodeList.Contains(t.Subject.Code)) - .Select(sv => new - { - SubjectVisitId = sv.Id, - TrialSiteCode = sv.TrialSite.TrialSiteCode, - SubjectCode = sv.Subject.Code, - VisitName = sv.VisitName, - VisitNum = sv.VisitNum, - StudyList = sv.StudyList.Select(u => new - { - StudyId = u.Id, - u.PatientId, - u.StudyTime, - u.StudyCode, - u.StudyInstanceUid, - u.StudyDIRPath, +// VisitList = t.SubjectVisitList.Where(t => t.VisitTaskList.Any(t => t.TaskState == TaskState.Effect && t.ReadingCategory == ReadingCategory.Visit && t.ReadingTaskState != ReadingTaskState.HaveSigned && t.SourceSubjectVisitId != null && t.DoctorUserId != null)) +// //.Where(t=>subjectCodeList.Contains(t.Subject.Code)) +// .Select(sv => new +// { +// SubjectVisitId = sv.Id, +// TrialSiteCode = sv.TrialSite.TrialSiteCode, +// SubjectCode = sv.Subject.Code, +// VisitName = sv.VisitName, +// VisitNum = sv.VisitNum, +// StudyList = sv.StudyList.Select(u => new +// { +// StudyId = u.Id, +// u.PatientId, +// u.StudyTime, +// u.StudyCode, +// u.StudyInstanceUid, +// u.StudyDIRPath, - SeriesList = u.SeriesList.Where(t => t.IsReading).Select(z => new - { - z.Modality, +// SeriesList = u.SeriesList.Where(t => t.IsReading).Select(z => new +// { +// z.Modality, - InstancePathList = z.DicomInstanceList.Where(t => t.IsReading).Select(k => new - { - InstanceId = k.Id, - k.Path, - k.IsEncapsulated, - k.NumberOfFrames, - }).ToList() - }) +// InstancePathList = z.DicomInstanceList.Where(t => t.IsReading).Select(k => new +// { +// InstanceId = k.Id, +// k.Path, +// k.IsEncapsulated, +// k.NumberOfFrames, +// }).ToList() +// }) - }).ToList(), +// }).ToList(), - NoneDicomStudyList = sv.NoneDicomStudyList.Where(t => t.IsReading).Select(nd => new - { - nd.Modality, - nd.StudyCode, - nd.ImageDate, +// NoneDicomStudyList = sv.NoneDicomStudyList.Where(t => t.IsReading).Select(nd => new +// { +// nd.Modality, +// nd.StudyCode, +// nd.ImageDate, - FileList = nd.NoneDicomFileList.Where(t => t.IsReading).Select(file => new - { - file.FileName, - file.Path, - file.FileType - }).ToList() - }).ToList() - }).OrderBy(t => t.SubjectCode).ThenBy(t => t.VisitNum).ToList() +// FileList = nd.NoneDicomFileList.Where(t => t.IsReading).Select(file => new +// { +// file.FileName, +// file.Path, +// file.FileType +// }).ToList() +// }).ToList() +// }).OrderBy(t => t.SubjectCode).ThenBy(t => t.VisitNum).ToList() - }).FirstOrDefault(); +// }).FirstOrDefault(); - var acturalDownList = downloadInfo.VisitList.Where(t => !oldVisits.Any(old => old.VisitNum == t.VisitNum && old.SubjectCode == t.SubjectCode && -old.VisitName.Trim().ToLower() == t.VisitName.Trim().ToLower())).ToList(); +// var acturalDownList = downloadInfo.VisitList.Where(t => !oldVisits.Any(old => old.VisitNum == t.VisitNum && old.SubjectCode == t.SubjectCode && +//old.VisitName.Trim().ToLower() == t.VisitName.Trim().ToLower())).ToList(); - var diffList = downloadVisit.Where(t => !acturalDownList.Any(old => old.SubjectCode.Trim() == t.SubjectCode.Trim() && -old.VisitName.Trim().ToLower() == t.VisitName.Trim().ToLower())).ToList(); +// var diffList = downloadVisit.Where(t => !acturalDownList.Any(old => old.SubjectCode.Trim() == t.SubjectCode.Trim() && +//old.VisitName.Trim().ToLower() == t.VisitName.Trim().ToLower())).ToList(); - string diffPath = @$"C:\Users\PC\Desktop\diff.xlsx"; - MiniExcel.SaveAs(diffPath, diffList); +// string diffPath = @$"C:\Users\PC\Desktop\diff.xlsx"; +// MiniExcel.SaveAs(diffPath, diffList); #endregion