XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

非dicom 文件修改列表预览可以查看删除
continuous-integration/drone/push Build is passing Details

Temp_Event_IRC_Met8
hang 2025-03-05 15:57:03 +08:00
parent 38917e05ab
commit e931e740e6
2 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs
View File

@ -40,8 +40,8 @@ namespace IRaCIS.Core.Application.Contracts
//质控过程中，因为会修改统计数字，但是此时其他人看，应该看到完整的影像 //质控过程中，因为会修改统计数字，但是此时其他人看，应该看到完整的影像
var isQCFinished = qcAuditState == AuditStateEnum.QCPassed; var isQCFinished = qcAuditState == AuditStateEnum.QCPassed;
//质控过程中并且不是IQC时， 需要忽略过滤器+忽略质控设置删除的 //质控过程中并且不是IQC时， 不需要忽略过滤器+质控设置删除的
var isIgnoreDelete = _userInfo.UserTypeEnumInt != (int)UserTypeEnum.IQC && !isQCFinished; var isIgnoreDelete = !(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.IQC && !isQCFinished);
IQueryable<NoneDicomStudyView> noneDicomStudyQueryable = default; IQueryable<NoneDicomStudyView> noneDicomStudyQueryable = default;
if (visitTaskId == null) 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 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) ; return ResponseOutput.Ok(list, config) ;
} }
@ -177,8 +177,8 @@ namespace IRaCIS.Core.Application.Contracts
//质控过程中，因为会修改统计数字，但是此时其他人看，应该看到完整的影像 //质控过程中，因为会修改统计数字，但是此时其他人看，应该看到完整的影像
var isQCFinished = qcAuditState == AuditStateEnum.QCPassed; var isQCFinished = qcAuditState == AuditStateEnum.QCPassed;
//质控过程中并且不是IQC时， 需要忽略过滤器+忽略质控设置删除的 //质控过程中并且不是IQC时， 不需要忽略过滤器+质控设置删除的
var isIgnoreDelete = _userInfo.UserTypeEnumInt != (int)UserTypeEnum.IQC && !isQCFinished; var isIgnoreDelete = !(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.IQC && !isQCFinished);
return await _noneDicomStudyFileRepository.Where(t => t.NoneDicomStudyId == noneDicomStudyId, ignoreQueryFilters: isIgnoreDelete) return await _noneDicomStudyFileRepository.Where(t => t.NoneDicomStudyId == noneDicomStudyId, ignoreQueryFilters: isIgnoreDelete)
.ProjectTo<NoneDicomStudyFileView>(_mapper.ConfigurationProvider).OrderBy(t => t.CreateTime).ToListAsync(); .ProjectTo<NoneDicomStudyFileView>(_mapper.ConfigurationProvider).OrderBy(t => t.CreateTime).ToListAsync();
@ -192,8 +192,8 @@ namespace IRaCIS.Core.Application.Contracts
//质控过程中，因为会修改统计数字，但是此时其他人看，应该看到完整的影像 //质控过程中，因为会修改统计数字，但是此时其他人看，应该看到完整的影像
var isQCFinished = qcAuditState == AuditStateEnum.QCPassed; var isQCFinished = qcAuditState == AuditStateEnum.QCPassed;
//质控过程中并且不是IQC时， 需要忽略过滤器+忽略质控设置删除的 //质控过程中并且不是IQC时， 不需要忽略过滤器+质控设置删除的
var isIgnoreDelete = _userInfo.UserTypeEnumInt != (int)UserTypeEnum.IQC && !isQCFinished; var isIgnoreDelete = !(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.IQC && !isQCFinished);
return await _noneDicomStudyFileRepository.Where(t => t.NoneDicomStudy.SubjectVisitId == subjectVisitId, ignoreQueryFilters: isIgnoreDelete) return await _noneDicomStudyFileRepository.Where(t => t.NoneDicomStudy.SubjectVisitId == subjectVisitId, ignoreQueryFilters: isIgnoreDelete)
.ProjectTo<NoneDicomStudyFileView>(_mapper.ConfigurationProvider).ToListAsync(); .ProjectTo<NoneDicomStudyFileView>(_mapper.ConfigurationProvider).ToListAsync();

26
IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyFileViewModel.cs
View File

@ -6,14 +6,9 @@
namespace IRaCIS.Core.Application.Contracts namespace IRaCIS.Core.Application.Contracts
{ {
/// <summary> NoneDicomStudyFileView 列表视图模型 </summary> /// <summary> NoneDicomStudyFileView 列表视图模型 </summary>
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; } public long? FileSize { get; set; }
@ -21,7 +16,9 @@ namespace IRaCIS.Core.Application.Contracts
public string FileType { get; set; } 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 string AuditInfo { get; set; } = string.Empty;
} }
public class NoneDicomStudyAndFile
{
public string NoneDicomStudyCode { get; set; } = string.Empty;
public List<NoneDicomStudyFileView> NoneDicomStudyFileList { get; set; } = new List<NoneDicomStudyFileView>();
}
///<summary>NoneDicomStudyFileQuery 列表查询参数模型</summary>
public class NoneDicomStudyFileQuery
{
///<summary> Path</summary>
public string Path { get; set; } = string.Empty;
///<summary> FileName</summary>
public string FileName { get; set; } = string.Empty;
}
///<summary> NoneDicomStudyFileAddOrEdit 列表查询参数模型</summary> ///<summary> NoneDicomStudyFileAddOrEdit 列表查询参数模型</summary>
public class NoneDicomStudyFileAddOrEdit public class NoneDicomStudyFileAddOrEdit