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

修改一版

Uat_Study
he 2022-07-22 10:16:38 +08:00
parent 5bfca31963
commit e36e130243
4 changed files with 14 additions and 6 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

@ -169,6 +169,8 @@ namespace IRaCIS.Core.Application.ViewModel
public int UnReadTaskCount { get; set; } public int UnReadTaskCount { get; set; }
public bool ExixtsReadingApply { get; set; }
public DateTime? SuggesteFinishedTime => UnReadTaskList.Max(t => t.SuggesteFinishedTime); public DateTime? SuggesteFinishedTime => UnReadTaskList.Max(t => t.SuggesteFinishedTime);
public List<IRUnreadTaskView> UnReadTaskList { get; set; } = new List<IRUnreadTaskView>(); public List<IRUnreadTaskView> UnReadTaskList { get; set; } = new List<IRUnreadTaskView>();

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

@ -909,16 +909,17 @@ namespace IRaCIS.Core.Application.Service.Allocation
var visitGroupQuery = _visitTaskRepository.Where(x => x.TrialId == trialId && x.DoctorUserId == _userInfo.Id) var visitGroupQuery = _visitTaskRepository.Where(x => x.TrialId == trialId && x.DoctorUserId == _userInfo.Id)
.Where(x => !x.Subject.IsDeleted) .Where(x => !x.Subject.IsDeleted)
.Where(t => t.ReadingTaskState != ReadingTaskState.HaveSigned && t.TaskState == TaskState.Effect) .Where(t => (t.ReadingTaskState != ReadingTaskState.HaveSigned && t.TaskState == TaskState.Effect)||t.ReReadingApplyState==ReReadingApplyState.HaveApplyed)
.GroupBy(x => new { x.SubjectId, x.Subject.Code, x.BlindSubjectCode }); .GroupBy(x => new { x.SubjectId, x.Subject.Code, x.BlindSubjectCode });
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,
UnReadTaskCount = x.Count(), UnReadTaskCount = x.Where(y=>y.ReReadingApplyState!= ReReadingApplyState.HaveApplyed).Count(),
UnReadTaskList = x.Select(u => new IRUnreadTaskView() { Id = u.Id, IsUrgent = u.IsUrgent, SuggesteFinishedTime = u.SuggesteFinishedTime }).ToList(), ExixtsReadingApply=x.Any(y=>y.ReReadingApplyState== ReReadingApplyState.HaveApplyed),
}); UnReadTaskList = x.Where(y => y.ReReadingApplyState != ReReadingApplyState.HaveApplyed).Select(u => new IRUnreadTaskView() { Id = u.Id, IsUrgent = u.IsUrgent, SuggesteFinishedTime = u.SuggesteFinishedTime }).ToList(),
}).Where(x=>x.UnReadTaskCount>0);
var totalCount = visitGroupQuery.Count(); var totalCount = visitGroupQuery.Count();
var currentPageData = await visitTaskQuery.OrderBy(x => x.SubjectId).Skip((iRUnReadSubjectQuery.PageIndex - 1) * iRUnReadSubjectQuery.PageSize) var currentPageData = await visitTaskQuery.OrderBy(x => x.SubjectId).Skip((iRUnReadSubjectQuery.PageIndex - 1) * iRUnReadSubjectQuery.PageSize)

5
IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
View File

@ -199,7 +199,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public Guid TrialId { get; set; } public Guid TrialId { get; set; }
public bool? IsCopyOrigenalForms { get; set; } = false;
public string RequestReReadingReason { get; set; } = string.Empty; public string RequestReReadingReason { get; set; } = string.Empty;
@ -219,6 +219,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public string DisagreeReason { get; set; } = string.Empty; public string DisagreeReason { get; set; } = string.Empty;
public bool IsCopyOrigenalForms { get; set; }
public bool IsCopyFollowForms { get; set; }
/// <summary> /// <summary>
/// 是否申请重阅 /// 是否申请重阅
/// </summary> /// </summary>

4
IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
View File

@ -389,7 +389,8 @@ namespace IRaCIS.Core.Application.Service
{ {
await _visitTaskService.ApplyReReading(new ApplyReReadingCommand() await _visitTaskService.ApplyReReading(new ApplyReReadingCommand()
{ {
IsCopyOrigenalForms = inDto.IsCopyOrigenalForms.Value, IsCopyOrigenalForms = inDto.IsCopyOrigenalForms,
IsCopyFollowForms=inDto.IsCopyFollowForms,
RequestReReadingReason = inDto.RequestReReadingReason, RequestReReadingReason = inDto.RequestReReadingReason,
RequestReReadingType = RequestReReadingType.DocotorApply, RequestReReadingType = RequestReReadingType.DocotorApply,
TrialId = inDto.TrialId, TrialId = inDto.TrialId,
@ -534,6 +535,7 @@ namespace IRaCIS.Core.Application.Service
{ {
var taskMedicalReviewquery = _taskMedicalReviewRepository.Where(x => x.TrialId == inDto.TrialId).Include(x => x.VisitTask) var taskMedicalReviewquery = _taskMedicalReviewRepository.Where(x => x.TrialId == inDto.TrialId).Include(x => x.VisitTask)
.Where(x => x.VisitTask.DoctorUserId == _userInfo.Id) .Where(x => x.VisitTask.DoctorUserId == _userInfo.Id)
.Where(x=>!x.IsHaveQuestion)
.Select(x => new GetIRMedicalFeedbackListOutDto .Select(x => new GetIRMedicalFeedbackListOutDto
{ {
Id = x.Id, Id = x.Id,