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

修改一版

Uat_Study
he 2022-07-01 17:09:26 +08:00
parent 3ac4979552
commit 2b380618de
2 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,31 +55,23 @@ namespace IRaCIS.Core.Application.Service
// 单审有序 // 单审有序
if (medicalReviewInfo.IsReadingTaskViewInOrder) if (medicalReviewInfo.IsReadingTaskViewInOrder)
{ {
switch (medicalReviewInfo.ReadingType) medicalReviewInfo.TaskList = await _visitTaskRepository.Where(x => x.SouceReadModuleId == taskInfo.SouceReadModuleId && x.SourceSubjectVisitId == taskInfo.SourceSubjectVisitId
&& x.DoctorUserId == taskInfo.DoctorUserId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ReReadingApplyState != ReReadingApplyState.Agree
).OrderBy(x => x.VisitTaskNum).Select(x => new TaskInfo()
{
Id = x.Id,
ReadingCategory = x.ReadingCategory,
TaskBlindName = x.TaskBlindName,
TaskName = x.TaskName
}).ToListAsync();
if (medicalReviewInfo.ReadingType == ReadingMethod.Double)
{ {
//case ReadingMethod.Single: //medicalReviewInfo.OtherDoctorTaskList=
// await GetOrderTaskInfo();
// break;
//case ReadingMethod.Double:
// await GetOrderTaskInfo();
// break;
} }
} }
//// 有序任务列表
//async Task GetOrderTaskInfo()
//{
// medicalReviewInfo.TaskList = await _visitTaskRepository.Where(x => x.SouceReadModuleId == taskInfo.SouceReadModuleId && x.SourceSubjectVisitId == taskInfo.SourceSubjectVisitId
// && x.DoctorUserId == taskInfo.DoctorUserId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ReReadingApplyState != ReReadingApplyState.Agree
// ).OrderBy(x => x.VisitTaskNum).Select(x => new TaskInfo()
// {
// Id = x.Id,
// ReadingCategory = x.ReadingCategory,
// TaskBlindName = x.TaskBlindName,
// TaskName = x.TaskName
// }).ToListAsync();
//}
return medicalReviewInfo; return medicalReviewInfo;

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

@ -425,7 +425,9 @@ namespace IRaCIS.Application.Services
{ {
var trialUsrSystemIds = _readingQuestionCriterionTrialRepository.Where(x => x.TrialId == trialId && x.ReadingQuestionCriterionSystemId != null) var trialUsrSystemIds = _readingQuestionCriterionTrialRepository.Where(x => x.TrialId == trialId && x.ReadingQuestionCriterionSystemId != null)
.Select(x => x.ReadingQuestionCriterionSystemId); .Select(x => x.ReadingQuestionCriterionSystemId);
var needAddSystemDataList = await _readingQuestionCriterionSystemRepository.Where(x => !trialUsrSystemIds.Contains(x.Id)&&x.Dictionary.IsEnable).Include(x=>x.ReadingQuestionSystemList).ToListAsync(); var trialCriterionNames= _readingQuestionCriterionTrialRepository.Where(x => x.TrialId == trialId)
.Select(x => x.CriterionName);
var needAddSystemDataList = await _readingQuestionCriterionSystemRepository.Where(x => !trialUsrSystemIds.Contains(x.Id)&&x.Dictionary.IsEnable&& !trialCriterionNames.Contains(x.CriterionName)).Include(x=>x.ReadingQuestionSystemList).ToListAsync();
List<ReadingQuestionCriterionTrial> needAddCriterionList = new List<ReadingQuestionCriterionTrial>(); List<ReadingQuestionCriterionTrial> needAddCriterionList = new List<ReadingQuestionCriterionTrial>();
List<ReadingQuestionTrial> needAddQuestionList = new List<ReadingQuestionTrial>(); List<ReadingQuestionTrial> needAddQuestionList = new List<ReadingQuestionTrial>();
needAddSystemDataList.ForEach(x => needAddSystemDataList.ForEach(x =>