Uat_Study
hang 2022-06-28 17:06:42 +08:00
parent 78b3633dbb
commit 8f228dc679
1 changed files with 21 additions and 18 deletions

View File

@ -338,7 +338,8 @@ namespace IRaCIS.Core.Application.Service
SubjectId = s.Id, SubjectId = s.Id,
SubjectCode = s.Code, SubjectCode = s.Code,
UnReadTaskCount = s.SubjectVisitTaskList.Count(t => t.ReadingTaskState != ReadingTaskState.HaveSigned && t.DoctorUserId == _userInfo.Id), UnReadTaskCount = s.SubjectVisitTaskList.Count(t => t.ReadingTaskState != ReadingTaskState.HaveSigned && t.DoctorUserId == _userInfo.Id),
UnReadTaskList = s.SubjectVisitTaskList.Where(t => t.ReadingTaskState != ReadingTaskState.HaveSigned && t.DoctorUserId == _userInfo.Id).Select(u => new IRUnreadTaskView() { Id = u.Id, IsUrgent = u.IsUrgent, SuggesteFinishedTime = u.SuggesteFinishedTime }).ToList(), UnReadTaskList = s.SubjectVisitTaskList.Where(t => t.ReadingTaskState != ReadingTaskState.HaveSigned && t.DoctorUserId == _userInfo.Id)
.Select(u => new IRUnreadTaskView() { Id = u.Id, IsUrgent = u.IsUrgent, SuggesteFinishedTime = u.SuggesteFinishedTime }).ToList(),
}) })
.Where(t => t.UnReadTaskCount > 0); .Where(t => t.UnReadTaskCount > 0);
@ -1054,11 +1055,13 @@ namespace IRaCIS.Core.Application.Service
//立即分配 //立即分配
else if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager) else if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager)
{ {
var doctorUserId = await _visitTaskRepository.Where(t => t.Id == item.OriginalReReadingTaskId).Select(t => t.DoctorUserId).FirstOrDefaultAsync();
await _visitTaskRepository.UpdatePartialFromQueryAsync(t => t.Id == item.NewReReadingTaskId, u => new VisitTask() await _visitTaskRepository.UpdatePartialFromQueryAsync(t => t.Id == item.NewReReadingTaskId, u => new VisitTask()
{ {
TaskState = TaskState.Effect, TaskState = TaskState.Effect,
DoctorUserId = _userInfo.Id, DoctorUserId = doctorUserId,
AllocateTime = DateTime.Now, AllocateTime = DateTime.Now,
}); });