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

修改

Uat_Study
he 2022-12-21 13:57:54 +08:00 committed by {872297557@qq.com}
parent 9a1ac447f8
commit 4cfd5250dc
4 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
View File

@ -507,10 +507,10 @@ namespace IRaCIS.Application.Services
var criterionType = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).Select(x => x.CriterionType).FirstNotNullAsync(); var criterionType = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).Select(x => x.CriterionType).FirstNotNullAsync();
var resultQuery = _readingClinicalDataRepository.Where(x => x.SubjectId == inDto.SubjectId) var resultQuery = _readingClinicalDataRepository.Where(x => x.SubjectId == inDto.SubjectId).Include(x => x.ClinicalDataTrialSet)
.Where(x => x.ReadingId == inDto.ReadingId) .Where(x => x.ReadingId == inDto.ReadingId || (x.SubjectId == inDto.SubjectId && x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.Subject))
.WhereIf(inDto.UploadRole == UploadRole.CRC, x => x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC) //.WhereIf(inDto.UploadRole == UploadRole.CRC, x => x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC)
.Include(x=>x.ClinicalDataTrialSet)
.Where(x=>x.ClinicalDataTrialSet.CriterionEnumListStr.Contains(((int)criterionType).ToString())) .Where(x=>x.ClinicalDataTrialSet.CriterionEnumListStr.Contains(((int)criterionType).ToString()))
.Select(x => new GetReadingClinicalDataListOutDto() .Select(x => new GetReadingClinicalDataListOutDto()
{ {
@ -540,7 +540,7 @@ namespace IRaCIS.Application.Services
}); });
var result = await resultQuery.ToListAsync(); var result = await resultQuery.ToListAsync();
result = result.Where(x => !(x.UploadRole == UploadRole.CRC && x.ClinicalUploadType == ClinicalUploadType.PDF && x.FileList.Count() == 0)).ToList(); //result = result.Where(x => !(x.UploadRole == UploadRole.CRC && x.ClinicalUploadType == ClinicalUploadType.PDF && x.FileList.Count() == 0)).ToList();
return result; return result;
} }

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

@ -373,6 +373,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string TaskBlindName { get; set; } public string TaskBlindName { get; set; }
public string ReadingUser { get; set; }
public bool IsReadingTaskViewInOrder { get; set; } public bool IsReadingTaskViewInOrder { get; set; }
public Guid VisitTaskId { get; set; } public Guid VisitTaskId { get; set; }
@ -571,7 +574,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// <summary> /// <summary>
/// 是否有全局更新 /// 是否有全局更新
/// </summary> /// </summary>
public bool IsGlobalChange { get; set; } public bool IsGlobalChange { get; set; } = false;
/// <summary> /// <summary>
/// 盲态名称 /// 盲态名称
@ -580,6 +583,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public Arm ArmEnum { get; set; } public Arm ArmEnum { get; set; }
/// <summary> /// <summary>
/// 评估结果 /// 评估结果
/// </summary> /// </summary>

16
IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs
View File

@ -80,7 +80,7 @@ namespace IRaCIS.Core.Application.Service
MedicalReviewInfo reviewInfo= await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId) MedicalReviewInfo reviewInfo= await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId)
.ProjectTo<MedicalReviewInfo>(_mapper.ConfigurationProvider).FirstNotNullAsync(); .ProjectTo<MedicalReviewInfo>(_mapper.ConfigurationProvider).FirstNotNullAsync();
var taskInfo = await _visitTaskRepository.Where(x => x.Id == reviewInfo.VisitTaskId).Include(x => x.Subject).FirstNotNullAsync(); var taskInfo = await _visitTaskRepository.Where(x => x.Id == reviewInfo.VisitTaskId).Include(x=>x.DoctorUser).Include(x => x.Subject).FirstNotNullAsync();
inDto.TrialReadingCriterionId = taskInfo.TrialReadingCriterionId; inDto.TrialReadingCriterionId = taskInfo.TrialReadingCriterionId;
var medicalReviewInfo = await _readingQuestionCriterionTrial.Where(x => x.Id == taskInfo.TrialReadingCriterionId).Select(x => new GetMedicalReviewReadingTaskOutDto() var medicalReviewInfo = await _readingQuestionCriterionTrial.Where(x => x.Id == taskInfo.TrialReadingCriterionId).Select(x => new GetMedicalReviewReadingTaskOutDto()
{ {
@ -97,6 +97,8 @@ namespace IRaCIS.Core.Application.Service
medicalReviewInfo.ArmEnum = taskInfo.ArmEnum; medicalReviewInfo.ArmEnum = taskInfo.ArmEnum;
medicalReviewInfo.SubjectCode = taskInfo.Subject.Code; medicalReviewInfo.SubjectCode = taskInfo.Subject.Code;
medicalReviewInfo.TaskBlindName = taskInfo.TaskBlindName; medicalReviewInfo.TaskBlindName = taskInfo.TaskBlindName;
medicalReviewInfo.ReadingUser = taskInfo.DoctorUser.FirstName + taskInfo.DoctorUser.LastName;
medicalReviewInfo.IsClosedDialog = medicalReviewInfo.MedicalReviewInfo.IsClosedDialog; medicalReviewInfo.IsClosedDialog = medicalReviewInfo.MedicalReviewInfo.IsClosedDialog;
medicalReviewInfo.AuditState = medicalReviewInfo.MedicalReviewInfo.AuditState; medicalReviewInfo.AuditState = medicalReviewInfo.MedicalReviewInfo.AuditState;
medicalReviewInfo.IsSendMessage = medicalReviewInfo.MedicalReviewInfo.IsSendMessage; medicalReviewInfo.IsSendMessage = medicalReviewInfo.MedicalReviewInfo.IsSendMessage;
@ -127,6 +129,7 @@ namespace IRaCIS.Core.Application.Service
ReadingCategory = x.ReadingCategory, ReadingCategory = x.ReadingCategory,
TaskBlindName = x.TaskBlindName, TaskBlindName = x.TaskBlindName,
ArmEnum = x.ArmEnum, ArmEnum = x.ArmEnum,
TaskName = x.TaskName, TaskName = x.TaskName,
SouceReadModuleId = x.SouceReadModuleId, SouceReadModuleId = x.SouceReadModuleId,
SourceSubjectVisitId = x.SourceSubjectVisitId, SourceSubjectVisitId = x.SourceSubjectVisitId,
@ -328,14 +331,25 @@ namespace IRaCIS.Core.Application.Service
visitTaskAnswer.AddRange(globalTaskAnswer); visitTaskAnswer.AddRange(globalTaskAnswer);
var globalChangeAnswer = await _readingGlobalTaskInfoRepository.Where(x => taskIds.Contains(x.GlobalTaskId) && x.GlobalAnswerType == GlobalAnswerType.Question).ToListAsync();
medicalReviewInfo.TaskList.ForEach(x => medicalReviewInfo.TaskList.ForEach(x =>
{ {
x.IsGlobalChange = globalChangeAnswer.Any(y => y.TaskId == x.TaskId);
x.JudgeQuestionAnswerInfoList = visitTaskAnswer.Where(y => y.VisitTaskId == x.TaskId).OrderBy(y => y.ShowOrder).ToList(); x.JudgeQuestionAnswerInfoList = visitTaskAnswer.Where(y => y.VisitTaskId == x.TaskId).OrderBy(y => y.ShowOrder).ToList();
}); });
} }
} }
medicalReviewInfo.TaskList.ForEach(x =>
{
x.IsCurrentTask = x.TaskId == taskInfo.Id;
});
#endregion #endregion
return medicalReviewInfo; return medicalReviewInfo;

4
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs
View File

@ -104,8 +104,8 @@ namespace IRaCIS.Application.Services
.Where(x => x.DoctorUserId == taskInfo.DoctorUserId) .Where(x => x.DoctorUserId == taskInfo.DoctorUserId)
.OrderBy(x => x.VisitTaskNum).Select(x => new GlobalVisitInfo() .OrderBy(x => x.VisitTaskNum).Select(x => new GlobalVisitInfo()
{ {
VisitName = x.SourceSubjectVisit.VisitName, VisitName = x.TaskName,
BlindName = x.SourceSubjectVisit.BlindName, BlindName = x.TaskBlindName,
VisitTaskId = x.Id, VisitTaskId = x.Id,
ArmEnum = taskInfo.ArmEnum, ArmEnum = taskInfo.ArmEnum,
VisitNum = x.SourceSubjectVisit.VisitNum, VisitNum = x.SourceSubjectVisit.VisitNum,