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

IRC_NewDev
hang 2024-02-22 17:55:20 +08:00
commit e9aeb1c918
1 changed files with 10 additions and 2 deletions

View File

@ -11,6 +11,8 @@ using Newtonsoft.Json;
using IRaCIS.Core.Application.Service;
using IRaCIS.Core.Application.ViewModel;
using IRaCIS.Core.Application.Filter;
using System.Linq.Dynamic.Core;
using NPOI.SS.Formula.Functions;
namespace IRaCIS.Application.Services
{
@ -164,9 +166,15 @@ namespace IRaCIS.Application.Services
ReadingTaskState = taskInfo.ReadingTaskState,
};
result.OtherGlobalTaskId = await _visitTaskRepository.Where(x => x.SouceReadModuleId == taskInfo.SouceReadModuleId && x.IsAnalysisCreate == taskInfo.IsAnalysisCreate
var otherGlobalTask = await _visitTaskRepository.Where(x => x.SouceReadModuleId == taskInfo.SouceReadModuleId && x.IsAnalysisCreate == taskInfo.IsAnalysisCreate
&& x.IsSelfAnalysis == taskInfo.IsSelfAnalysis && x.TaskState == TaskState.Effect && x.DoctorUserId != taskInfo.DoctorUserId
).Select(x => x.Id).FirstOrDefaultAsync();
).FirstOrDefaultAsync();
if (otherGlobalTask != null)
{
result.OtherGlobalTaskId = otherGlobalTask.Id;
}
result.TaskBlindName = taskInfo.TaskBlindName;
if (taskInfo.IsAnalysisCreate)