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

Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8

IRC_NewDev
hang 2024-03-01 09:16:11 +08:00
parent 246314561b 331a3c4178
commit 16829f9075
3 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -187,8 +187,8 @@ namespace IRaCIS.Application.Services
public async Task<List<GetCRCClinicalDataOutDto>> GetCRCClinicalData(GetCRCClinicalDataInDto inDto) public async Task<List<GetCRCClinicalDataOutDto>> GetCRCClinicalData(GetCRCClinicalDataInDto inDto)
{ {
List<GetCRCClinicalDataOutDto> cRCClinicalDataList = await _readingClinicalDataRepository.Where(x => x.ReadingId == inDto.SubjectVisitId) List<GetCRCClinicalDataOutDto> cRCClinicalDataList = await _readingClinicalDataRepository.Where(x => x.ReadingId == inDto.SubjectVisitId)
.WhereIf(inDto.IsBaseline, x => x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.Subject || x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.SubjectVisit) .WhereIf(inDto.IsBaseline, x => x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.Subject || x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.SubjectVisit|| x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.Study)
.WhereIf(!inDto.IsBaseline, x => x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.SubjectVisit) .WhereIf(!inDto.IsBaseline, x => x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.SubjectVisit || x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.Study)
.Where(x => x.ClinicalDataTrialSet.TrialId == inDto.TrialId && x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC) .Where(x => x.ClinicalDataTrialSet.TrialId == inDto.TrialId && x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC)
.Select(x => new GetCRCClinicalDataOutDto() .Select(x => new GetCRCClinicalDataOutDto()
{ {

5
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs
View File

@ -426,7 +426,8 @@ namespace IRaCIS.Application.Services
SignTime = DateTime.Now, SignTime = DateTime.Now,
JudgeResultImagePath = string.Join(',', inDto.JudgeResultImagePathList), JudgeResultImagePath = string.Join(',', inDto.JudgeResultImagePathList),
}); });
await _visitTaskRepository.SaveChangesAsync(); var result = await _visitTaskRepository.SaveChangesAsync();
// 需要判断是否添加肿瘤学任务 // 需要判断是否添加肿瘤学任务
var taskInfo = await _visitTaskRepository.Where(x => x.JudgeVisitTaskId == inDto.VisitTaskId).Include(x => x.TrialReadingCriterion).FirstNotNullAsync(); var taskInfo = await _visitTaskRepository.Where(x => x.JudgeVisitTaskId == inDto.VisitTaskId).Include(x => x.TrialReadingCriterion).FirstNotNullAsync();
@ -461,7 +462,7 @@ namespace IRaCIS.Application.Services
} }
var result = await _visitTaskRepository.SaveChangesAsync();
// 创建任务关联关系 // 创建任务关联关系

34
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs
View File

@ -128,6 +128,8 @@ namespace IRaCIS.Application.Services
//visitTask = await _visitTaskRepository.Where(x => x.Id == judgeResultTaskId).FirstNotNullAsync(); //visitTask = await _visitTaskRepository.Where(x => x.Id == judgeResultTaskId).FirstNotNullAsync();
visitTaskIdList= await _visitTaskRepository.Where(x => x.Id == judgeResultTaskId).Select(x=>x.RelatedVisitTaskIdList).FirstNotNullAsync(); visitTaskIdList= await _visitTaskRepository.Where(x => x.Id == judgeResultTaskId).Select(x=>x.RelatedVisitTaskIdList).FirstNotNullAsync();
globalOrVisitTaskInfo = await _visitTaskRepository.Where(x => x.Id == judgeResultTaskId).FirstNotNullAsync();
} }
@ -154,17 +156,17 @@ namespace IRaCIS.Application.Services
{ {
// 按照全局那边的查询法 // 按照全局那边的查询法
globalVisits =await _visitTaskRepository.Where(x => globalVisits =await _visitTaskRepository.Where(x =>
x.TrialId == taskInfo.TrialId && x.TrialId == globalOrVisitTaskInfo.TrialId &&
x.SubjectId == taskInfo.SubjectId && x.SubjectId == globalOrVisitTaskInfo.SubjectId &&
x.ReadingCategory == ReadingCategory.Visit && x.ReadingCategory == ReadingCategory.Visit &&
x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId && x.TrialReadingCriterionId == globalOrVisitTaskInfo.TrialReadingCriterionId &&
x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ReadingTaskState == ReadingTaskState.HaveSigned &&
x.IsAnalysisCreate == taskInfo.IsAnalysisCreate && x.IsAnalysisCreate == globalOrVisitTaskInfo.IsAnalysisCreate &&
x.ArmEnum == taskInfo.ArmEnum && x.ArmEnum == globalOrVisitTaskInfo.ArmEnum &&
x.IsSelfAnalysis == taskInfo.IsSelfAnalysis && x.IsSelfAnalysis == globalOrVisitTaskInfo.IsSelfAnalysis &&
x.DoctorUserId == taskInfo.DoctorUserId && x.DoctorUserId == globalOrVisitTaskInfo.DoctorUserId &&
x.TaskState == TaskState.Effect && x.TaskState == TaskState.Effect &&
x.VisitTaskNum < globalOrVisitTaskInfo.VisitTaskNum) x.VisitTaskNum <= globalOrVisitTaskInfo.VisitTaskNum)
.OrderBy(x => x.VisitTaskNum).Select(x => new GlobalVisitInfo() .OrderBy(x => x.VisitTaskNum).Select(x => new GlobalVisitInfo()
{ {
VisitName = x.TaskName, VisitName = x.TaskName,
@ -172,7 +174,7 @@ namespace IRaCIS.Application.Services
VisitTaskId = x.Id, VisitTaskId = x.Id,
IsConvertedTask = x.IsConvertedTask, IsConvertedTask = x.IsConvertedTask,
IsFirstChangeTask = x.IsConvertedTask && x.BeforeConvertedTaskId != null, IsFirstChangeTask = x.IsConvertedTask && x.BeforeConvertedTaskId != null,
ArmEnum = taskInfo.ArmEnum, ArmEnum = globalOrVisitTaskInfo.ArmEnum,
VisitNum = x.SourceSubjectVisit.VisitNum, VisitNum = x.SourceSubjectVisit.VisitNum,
IsBaseLine = x.SourceSubjectVisit.IsBaseLine, IsBaseLine = x.SourceSubjectVisit.IsBaseLine,
VisitId = x.SourceSubjectVisitId!.Value, VisitId = x.SourceSubjectVisitId!.Value,
@ -182,7 +184,7 @@ namespace IRaCIS.Application.Services
Count = x.ToList().Count() Count = x.ToList().Count()
}).ToList(), }).ToList(),
//CrterionDictionaryGroup= x.CrterionDictionaryGroup, //CrterionDictionaryGroup= x.CrterionDictionaryGroup,
BeforeQuestionList = x.ReadingTaskQuestionAnswerList.Where(y => y.ReadingQuestionTrial.GlobalReadingShowType != GlobalReadingShowType.NotShow).OrderBy(y => y.ReadingQuestionTrial.ShowOrder) AfterQuestionList = x.ReadingTaskQuestionAnswerList.Where(y => y.ReadingQuestionTrial.GlobalReadingShowType != GlobalReadingShowType.NotShow).OrderBy(y => y.ReadingQuestionTrial.ShowOrder)
.Select(y => new GlobalQuestionInfo() .Select(y => new GlobalQuestionInfo()
{ {
@ -430,13 +432,15 @@ namespace IRaCIS.Application.Services
else { else {
globalOrVisitTaskId = await _visitTaskRepository.Where(x => x.SourceSubjectVisitId == readModuleInfo.SubjectVisitId && x.TaskState == TaskState.Effect var visitTask = await _visitTaskRepository.Where(x => x.SourceSubjectVisitId == readModuleInfo.SubjectVisitId && x.TaskState == TaskState.Effect
&& x.TrialReadingCriterionId == readModuleInfo.TrialReadingCriterionId && x.TrialReadingCriterionId == readModuleInfo.TrialReadingCriterionId
&& x.ReadingTaskState == ReadingTaskState.HaveSigned).Select(x => x.Id).FirstOrDefaultAsync(); && x.ReadingCategory==ReadingCategory.Visit
&& x.ReadingTaskState == ReadingTaskState.HaveSigned).FirstNotNullAsync();
globalOrVisitTaskId = visitTask.Id;
var judgeVisitTaskId = visitTask.JudgeVisitTaskId;
var judgeVisitTaskId = await _visitTaskRepository.Where(x => x.SourceSubjectVisitId == readModuleInfo.SubjectVisitId && x.TaskState == TaskState.Effect
&&x.TrialReadingCriterionId== readModuleInfo.TrialReadingCriterionId
&& x.ReadingTaskState == ReadingTaskState.HaveSigned).Select(x => x.JudgeVisitTaskId).FirstOrDefaultAsync();
// 要判断是否为老裁判任务的Id // 要判断是否为老裁判任务的Id
if (judgeVisitTaskId != null) if (judgeVisitTaskId != null)
{ {