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

影像的列表

Uat_Study
hang 2022-07-15 11:45:23 +08:00
parent b7207d2656
commit 5a96393e7f
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
IRaCIS.Core.Application/Service/Allocation/DTO/TaskConsistentRuleViewModel.cs
View File

@ -149,25 +149,25 @@ namespace IRaCIS.Core.Application.ViewModel
} }
public class DoctorConsistentRuleSubjectView //public class DoctorConsistentRuleSubjectView
{ //{
public Guid TrialId => VisitTaskList.Select(t => t.TrialId).First(); // public Guid TrialId => VisitTaskList.Select(t => t.TrialId).First();
public Guid SiteId => VisitTaskList.Select(t => t.SiteId).First(); // public Guid SiteId => VisitTaskList.Select(t => t.SiteId).First();
public String TrialSiteCode => VisitTaskList.Select(t => t.TrialSiteCode).First(); // public String TrialSiteCode => VisitTaskList.Select(t => t.TrialSiteCode).First();
public string SubjectCode => VisitTaskList.Select(t => t.SubjectCode).First(); // public string SubjectCode => VisitTaskList.Select(t => t.SubjectCode).First();
public Guid SubjectId { get; set; } // public Guid SubjectId { get; set; }
public bool IsHaveGeneratedTask { get; set; } // public bool IsHaveGeneratedTask { get; set; }
public int? ValidTaskCount { get; set; } // public int? ValidTaskCount { get; set; }
public int? ValidVisitCount => VisitTaskList.Select(t => t.TaskName).Distinct().Count(); // public int? ValidVisitCount => VisitTaskList.Select(t => t.TaskName).Distinct().Count();
public List<VisitTaskSimpleView> VisitTaskList { get; set; } // public List<VisitTaskSimpleView> VisitTaskList { get; set; }
//public List<UserSimpleInfo> HistoryDoctorUserList => VisitTaskList.SelectMany(t => t.RelationDoctorUserList).DistinctBy(t=>t.UserId).ToList(); // //public List<UserSimpleInfo> HistoryDoctorUserList => VisitTaskList.SelectMany(t => t.RelationDoctorUserList).DistinctBy(t=>t.UserId).ToList();
} //}
public class VisitTaskSimpleView public class VisitTaskSimpleView
{ {
@ -196,6 +196,7 @@ namespace IRaCIS.Core.Application.ViewModel
public string SubjectCode { get; set; } = String.Empty; public string SubjectCode { get; set; } = String.Empty;
public UserSimpleInfo DoctorUser { get; set; }
public List<VisitTaskSimpleView> GlobalVisitTaskList { get; set; } public List<VisitTaskSimpleView> GlobalVisitTaskList { get; set; }

7
IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs
View File

@ -111,6 +111,8 @@ namespace IRaCIS.Core.Application.Service
using (await _mutex.LockAsync()) using (await _mutex.LockAsync())
{ {
int maxCodeInt = 0;
foreach (var subject in list) foreach (var subject in list)
{ {
//处理 Subject 编号 //处理 Subject 编号
@ -125,8 +127,7 @@ namespace IRaCIS.Core.Application.Service
else else
{ {
var maxCodeStr = _visitTaskRepository.Where(t => t.TrialId == subject.TrialId).OrderByDescending(t => t.BlindSubjectCode).Select(t => t.BlindSubjectCode).FirstOrDefault(); var maxCodeStr = _visitTaskRepository.Where(t => t.TrialId == subject.TrialId).OrderByDescending(t => t.BlindSubjectCode).Select(t => t.BlindSubjectCode).FirstOrDefault();
int maxCodeInt = 0;
int.TryParse(maxCodeStr, out maxCodeInt); int.TryParse(maxCodeStr, out maxCodeInt);
blindSubjectCode = (maxCodeInt + 1).ToString($"D{filterObj.BlindSubjectNumberOfPlaces}"); blindSubjectCode = (maxCodeInt + 1).ToString($"D{filterObj.BlindSubjectNumberOfPlaces}");
@ -264,7 +265,7 @@ namespace IRaCIS.Core.Application.Service
if (filterObj == null) if (filterObj == null)
{ {
throw new BusinessValidationFailedException("请先配置后，再进行数据查询"); return new PageOutput<DoctorGroupConsistentSubjectView>();
} }
var query = await GetGroupConsistentQueryAsync(filterObj); var query = await GetGroupConsistentQueryAsync(filterObj);

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

@ -179,7 +179,7 @@ namespace IRaCIS.Core.Application.Service
public async Task<(PageOutput<ReadingTaskView>, object)> GetReadingTaskList(VisitTaskQuery queryVisitTask) public async Task<(PageOutput<ReadingTaskView>, object)> GetReadingTaskList(VisitTaskQuery queryVisitTask)
{ {
var visitTaskQueryable = _visitTaskRepository.Where(t => t.TrialId == queryVisitTask.TrialId) var visitTaskQueryable = _visitTaskRepository.Where(t => t.TrialId == queryVisitTask.TrialId)
.Where(t =>/* t.IsReReadingCreate == false &&*/ t.DoctorUserId != null) .Where(t => t.IsAnalysisCreate == false && t.DoctorUserId != null)
.WhereIf(queryVisitTask.SiteId != null, t => t.Subject.SiteId == queryVisitTask.SiteId) .WhereIf(queryVisitTask.SiteId != null, t => t.Subject.SiteId == queryVisitTask.SiteId)
.WhereIf(queryVisitTask.SubjectId != null, t => t.SubjectId == queryVisitTask.SubjectId) .WhereIf(queryVisitTask.SubjectId != null, t => t.SubjectId == queryVisitTask.SubjectId)