From dd33f7e0867e46ec8f9bec96eb2d7296b5b0bc3e Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 5 Mar 2025 15:21:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BF=BD=E7=95=A5?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/QC/QCListService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/QC/QCListService.cs b/IRaCIS.Core.Application/Service/QC/QCListService.cs index baba1c431..ab9e2c3a5 100644 --- a/IRaCIS.Core.Application/Service/QC/QCListService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCListService.cs @@ -380,7 +380,7 @@ namespace IRaCIS.Core.Application.Image.QA ExistsManual = (await _IReadingImageTaskService.GetManualList(new GetManualListInDto() { TrialId = sv.TrialId })).Count() > 0, SeriesList = temp.SeriesList, RelationInfo = await GetVisitQCSubjectInfo(subjectVisitId), - NoneDicomStudyList = await _noneDicomStudyRepository.Where(t => t.SubjectVisitId == subjectVisitId).ProjectTo(_mapper.ConfigurationProvider).ToListAsync(), + NoneDicomStudyList = await _noneDicomStudyRepository.Where(t => t.SubjectVisitId == subjectVisitId,ignoreQueryFilters:true).ProjectTo(_mapper.ConfigurationProvider).ToListAsync(), SubjectClinicalData = await _subjectVisitRepository.Where(t => t.Id == subjectVisitId) .ProjectTo(_mapper.ConfigurationProvider, new { subjectVisitId = subjectVisitId, token = _userInfo.UserToken }).FirstOrDefaultAsync() }; From e931e740e6d13c53369b05d34e31e25b530aadac Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 5 Mar 2025 15:57:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=9D=9Edicom=20=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8=E9=A2=84=E8=A7=88=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E6=9F=A5=E7=9C=8B=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ImageAndDoc/NoneDicomStudyService.cs | 14 +++++----- .../QC/DTO/NoneDicomStudyFileViewModel.cs | 26 +++---------------- 2 files changed, 11 insertions(+), 29 deletions(-) diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs index bb8bdf8bf..3bdcd5cc8 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs @@ -40,8 +40,8 @@ namespace IRaCIS.Core.Application.Contracts //质控过程中，因为会修改统计数字，但是此时其他人看，应该看到完整的影像 var isQCFinished = qcAuditState == AuditStateEnum.QCPassed; - //质控过程中并且不是IQC时， 需要忽略过滤器+忽略质控设置删除的 - var isIgnoreDelete = _userInfo.UserTypeEnumInt != (int)UserTypeEnum.IQC && !isQCFinished; + //质控过程中并且不是IQC时， 不需要忽略过滤器+质控设置删除的 + var isIgnoreDelete = !(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.IQC && !isQCFinished); IQueryable noneDicomStudyQueryable = default; if (visitTaskId == null) @@ -65,7 +65,7 @@ namespace IRaCIS.Core.Application.Contracts var list = await noneDicomStudyQueryable.OrderBy(x => x.ImageDate).ThenBy(x => x.CreateTime).ToListAsync(); - var config = await _subjectVisitRepository.Where(t => t.Id == subjectVisitId).Select(t => new { t.Trial.ImageFormatList, t.Trial.StudyNameList ,t.Trial.IsShowStudyName}).FirstOrDefaultAsync(); + var config = await _subjectVisitRepository.Where(t => t.Id == subjectVisitId).Select(t => new { t.Trial.ImageFormatList, t.Trial.StudyNameList ,t.Trial.IsShowStudyName, AuditState = qcAuditState }).FirstOrDefaultAsync(); return ResponseOutput.Ok(list, config) ; } @@ -177,8 +177,8 @@ namespace IRaCIS.Core.Application.Contracts //质控过程中，因为会修改统计数字，但是此时其他人看，应该看到完整的影像 var isQCFinished = qcAuditState == AuditStateEnum.QCPassed; - //质控过程中并且不是IQC时， 需要忽略过滤器+忽略质控设置删除的 - var isIgnoreDelete = _userInfo.UserTypeEnumInt != (int)UserTypeEnum.IQC && !isQCFinished; + //质控过程中并且不是IQC时， 不需要忽略过滤器+质控设置删除的 + var isIgnoreDelete = !(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.IQC && !isQCFinished); return await _noneDicomStudyFileRepository.Where(t => t.NoneDicomStudyId == noneDicomStudyId, ignoreQueryFilters: isIgnoreDelete) .ProjectTo(_mapper.ConfigurationProvider).OrderBy(t => t.CreateTime).ToListAsync(); @@ -192,8 +192,8 @@ namespace IRaCIS.Core.Application.Contracts //质控过程中，因为会修改统计数字，但是此时其他人看，应该看到完整的影像 var isQCFinished = qcAuditState == AuditStateEnum.QCPassed; - //质控过程中并且不是IQC时， 需要忽略过滤器+忽略质控设置删除的 - var isIgnoreDelete = _userInfo.UserTypeEnumInt != (int)UserTypeEnum.IQC && !isQCFinished; + //质控过程中并且不是IQC时， 不需要忽略过滤器+质控设置删除的 + var isIgnoreDelete = !(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.IQC && !isQCFinished); return await _noneDicomStudyFileRepository.Where(t => t.NoneDicomStudy.SubjectVisitId == subjectVisitId, ignoreQueryFilters: isIgnoreDelete) .ProjectTo(_mapper.ConfigurationProvider).ToListAsync(); diff --git a/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyFileViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyFileViewModel.cs index 203c910d7..55a5f8b02 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyFileViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyFileViewModel.cs @@ -6,14 +6,9 @@ namespace IRaCIS.Core.Application.Contracts { /// NoneDicomStudyFileView 列表视图模型 - public class NoneDicomStudyFileView + public class NoneDicomStudyFileView: NoneDicomStudyFileAddOrEdit { - public Guid Id { get; set; } - public string Path { get; set; } = string.Empty; - public string FileName { get; set; } = string.Empty; - public DateTime CreateTime { get; set; } - public Guid CreateUserId { get; set; } - public Guid NoneDicomStudyId { get; set; } + public long? FileSize { get; set; } @@ -21,7 +16,9 @@ namespace IRaCIS.Core.Application.Contracts public string FileType { get; set; } + public bool IsReading { get; set; } + public bool IsDeleted { get; set; } } @@ -33,24 +30,9 @@ namespace IRaCIS.Core.Application.Contracts public string AuditInfo { get; set; } = string.Empty; } - public class NoneDicomStudyAndFile - { - public string NoneDicomStudyCode { get; set; } = string.Empty; - public List NoneDicomStudyFileList { get; set; } = new List(); - } - ///NoneDicomStudyFileQuery 列表查询参数模型 - public class NoneDicomStudyFileQuery - { - /// Path - public string Path { get; set; } = string.Empty; - - /// FileName - public string FileName { get; set; } = string.Empty; - - } /// NoneDicomStudyFileAddOrEdit 列表查询参数模型 public class NoneDicomStudyFileAddOrEdit