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

修改查询

Uat_Study
hang 2023-07-17 10:17:47 +08:00
parent f7c41d1b9a
commit 2f5a4d5515
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
View File

@ -276,7 +276,7 @@ namespace IRaCIS.Core.Application.ViewModel
public Guid? ClaimUserId { get; set; } public Guid? ClaimUserId { get; set; }
public string? ClaimUserName { get; set; }
public bool IsUrgent => UnReadTaskList.Any(t => t.IsUrgent); public bool IsUrgent => UnReadTaskList.Any(t => t.IsUrgent);
public int UnReadTaskCount { get; set; } public int UnReadTaskCount { get; set; }

3
IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
View File

@ -659,13 +659,14 @@ namespace IRaCIS.Core.Application.Service.Allocation
.WhereIf(!string.IsNullOrEmpty(inDto.SubjectCode), t => (t.Subject.Code.Contains(inDto.SubjectCode) && t.IsAnalysisCreate == false) || (t.BlindSubjectCode.Contains(inDto.SubjectCode) && t.IsAnalysisCreate)); .WhereIf(!string.IsNullOrEmpty(inDto.SubjectCode), t => (t.Subject.Code.Contains(inDto.SubjectCode) && t.IsAnalysisCreate == false) || (t.BlindSubjectCode.Contains(inDto.SubjectCode) && t.IsAnalysisCreate));
var visitGroupQuery = visitQuery.GroupBy(x => new { x.SubjectId, x.Subject.Code, x.BlindSubjectCode, x.Subject.ClaimUserId }); var visitGroupQuery = visitQuery.GroupBy(x => new { x.SubjectId, x.Subject.Code, x.BlindSubjectCode, x.Subject.ClaimUserId ,x.Subject.ClaimUser.UserName });
var visitTaskQuery = visitGroupQuery.Select(x => new IRUnReadSubjectView() var visitTaskQuery = visitGroupQuery.Select(x => new IRUnReadSubjectView()
{ {
SubjectId = x.Key.SubjectId, SubjectId = x.Key.SubjectId,
SubjectCode = x.Key.BlindSubjectCode == string.Empty ? x.Key.Code : x.Key.BlindSubjectCode, SubjectCode = x.Key.BlindSubjectCode == string.Empty ? x.Key.Code : x.Key.BlindSubjectCode,
ClaimUserId = x.Key.ClaimUserId, ClaimUserId = x.Key.ClaimUserId,
ClaimUserName=x.Key.UserName,
SuggesteFinishedTime = x.Where(y => y.TrialReadingCriterionId == trialReadingCriterionId && y.ReadingTaskState != ReadingTaskState.HaveSigned).Min(x => x.SuggesteFinishedTime), SuggesteFinishedTime = x.Where(y => y.TrialReadingCriterionId == trialReadingCriterionId && y.ReadingTaskState != ReadingTaskState.HaveSigned).Min(x => x.SuggesteFinishedTime),

6
IRaCIS.Core.Domain/Trial/Trial.cs
View File

@ -231,12 +231,12 @@ namespace IRaCIS.Core.Domain.Models
/// <summary> /// <summary>
/// QC流程 0 不审，1 单审，2双审 /// QC流程 0 不审，1 单审，2双审
/// </summary> /// </summary>
public TrialQCProcess QCProcessEnum { get; set; } = TrialQCProcess.DoubleAudit; public TrialQCProcess QCProcessEnum { get; set; } = TrialQCProcess.NotAudit;
/// <summary> /// <summary>
/// 影像一致性核查 /// 影像一致性核查
/// </summary> /// </summary>
public bool IsImageConsistencyVerification { get; set; } = true; public bool IsImageConsistencyVerification { get; set; } = false;
/// <summary> /// <summary>
/// 影像导出 /// 影像导出
@ -359,7 +359,7 @@ namespace IRaCIS.Core.Domain.Models
public bool IsDeclaration { get; set; } public bool IsDeclaration { get; set; }
public bool IsMedicalReview { get; set; } public bool IsMedicalReview { get; set; } = false;
public UserTypeEnum? EnrollConfirmDefaultUserType { get; set; } public UserTypeEnum? EnrollConfirmDefaultUserType { get; set; }

2
IRaCIS.Core.Domain/Visit/Subject.cs
View File

@ -125,6 +125,8 @@ namespace IRaCIS.Core.Domain.Models
public Guid? ClaimUserId { get; set; } public Guid? ClaimUserId { get; set; }
[JsonIgnore]
public User ClaimUser { get; set;}
//是否分配了读片医生 //是否分配了读片医生
//public bool IsAssignDoctorUser{get;set;} //public bool IsAssignDoctorUser{get;set;}