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

修改

Uat_Study
he 2023-01-11 11:14:16 +08:00
parent 70679cbf17
commit 6a7a5cc2dd
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IRaCIS.Core.Application/Service/Doctor/DoctorService.cs
View File

@ -502,12 +502,12 @@ namespace IRaCIS.Application.Services
/// <param name="inDto"></param> /// <param name="inDto"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public async Task<List<DoctorCriterionFile>> GetDoctorCriterionFile(GetDoctorCriterionFileInDto inDto) public async Task<List<GetDoctorCriterionFileOutDto>> GetDoctorCriterionFile(GetDoctorCriterionFileInDto inDto)
{ {
var result = await _doctorCriterionFileRepository.Where(x => x.DoctorId == inDto.DoctorId) var result = await _doctorCriterionFileRepository.Where(x => x.DoctorId == inDto.DoctorId)
.WhereIf(inDto.CriterionType != null, x => x.CriterionType == inDto.CriterionType) .WhereIf(inDto.CriterionType != null, x => x.CriterionType == inDto.CriterionType)
.WhereIf(inDto.FileType != null, x => x.FileType == inDto.FileType) .WhereIf(inDto.FileType != null, x => x.FileType == inDto.FileType)
.ProjectTo<DoctorCriterionFile>(_mapper.ConfigurationProvider) .ProjectTo<GetDoctorCriterionFileOutDto>(_mapper.ConfigurationProvider)
.ToListAsync(); .ToListAsync();
return result; return result;
} }

14
IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs
View File

@ -271,7 +271,7 @@ namespace IRaCIS.Application.Contracts
public List<TrialCriterionReadingCategory> CriterionReadingCategoryList { get; set; } public List<TrialCriterionReadingCategory> CriterionReadingCategoryList { get; set; }
//任务阅片状态 //任务阅片状态
public List<ReadingTaskState> ReadingTaskStateList { get; set; } public List<DoctorUserTask> ReadingTaskStateList { get; set; }
public List<CriterionFile> CriterionFileList { get; set; } public List<CriterionFile> CriterionFileList { get; set; }
@ -281,8 +281,8 @@ namespace IRaCIS.Application.Contracts
new CriterionReadingCategory() new CriterionReadingCategory()
{ {
EnrollId = EnrollId, EnrollId = EnrollId,
ToDoQuantity= ReadingTaskStateList.Where(x=>x!=ReadingTaskState.HaveSigned).Count(), ToDoQuantity= ReadingTaskStateList.Where(x=>x.ReadingTaskState != ReadingTaskState.HaveSigned&&x.CriterionType== t.CriterionType).Count(),
CompletionQuantity = ReadingTaskStateList.Where(x => x == ReadingTaskState.HaveSigned).Count(), CompletionQuantity = ReadingTaskStateList.Where(x => x.ReadingTaskState == ReadingTaskState.HaveSigned && x.CriterionType == t.CriterionType).Count(),
CriterionFileList = CriterionFileList.Where(x=>x.CriterionType==t.CriterionType).ToList(), CriterionFileList = CriterionFileList.Where(x=>x.CriterionType==t.CriterionType).ToList(),
TrialReadingCriterionId = t.TrialReadingCriterionId, TrialReadingCriterionId = t.TrialReadingCriterionId,
ReadingCategorys = CriterionReadingCategoryList.Where(c => c.TrialReadingCriterionId == t.TrialReadingCriterionId).Select(t => t.ReadingCategory).OrderBy(c => c).ToList() ReadingCategorys = CriterionReadingCategoryList.Where(c => c.TrialReadingCriterionId == t.TrialReadingCriterionId).Select(t => t.ReadingCategory).OrderBy(c => c).ToList()
@ -297,6 +297,14 @@ namespace IRaCIS.Application.Contracts
} }
public class DoctorUserTask
{
public ReadingTaskState ReadingTaskState { get; set; }
public CriterionType? CriterionType { get; set; }
}
public class TrialReadingCriterionDto public class TrialReadingCriterionDto
{ {
public Guid TrialReadingCriterionId { get; set; } public Guid TrialReadingCriterionId { get; set; }

7
IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs
View File

@ -217,7 +217,12 @@ namespace IRaCIS.Application.Services
Id=x.Id Id=x.Id
}).ToList(), }).ToList(),
CriterionReadingCategoryList =intoGroup.EnrollReadingCategoryList.Select(t=>new TrialCriterionReadingCategory() { EnrollId=t.EnrollId,ReadingCategory=t.ReadingCategory, TrialReadingCriterionId = t.TrialReadingCriterionId }).ToList(), CriterionReadingCategoryList =intoGroup.EnrollReadingCategoryList.Select(t=>new TrialCriterionReadingCategory() { EnrollId=t.EnrollId,ReadingCategory=t.ReadingCategory, TrialReadingCriterionId = t.TrialReadingCriterionId }).ToList(),
ReadingTaskStateList=doctor.User.VisitTaskList.Where(x=>x.TaskState==TaskState.Effect&&x.TrialId== trialId).Select(x=>x.ReadingTaskState).ToList(),
ReadingTaskStateList=doctor.User.VisitTaskList.Where(x=>x.TaskState==TaskState.Effect&&x.TrialId== trialId).Select(x=> new DoctorUserTask() {
ReadingTaskState= x.ReadingTaskState,
CriterionType=x.TrialReadingCriterion.CriterionType,
}).ToList(),
DoctorId = doctor.Id, DoctorId = doctor.Id,
Code = doctor.ReviewerCode, Code = doctor.ReviewerCode,
FirstName = doctor.FirstName, FirstName = doctor.FirstName,