修改一版
parent
904d5f3a3d
commit
30f4dae15b
|
@ -86,8 +86,11 @@ namespace IRaCIS.Core.Application.Service
|
||||||
.WhereIf(taskInfo.ArmEnum == Arm.JudgeArm, x => x.ArmEnum == Arm.JudgeArm)
|
.WhereIf(taskInfo.ArmEnum == Arm.JudgeArm, x => x.ArmEnum == Arm.JudgeArm)
|
||||||
.WhereIf(taskInfo.ArmEnum != Arm.JudgeArm, x => x.ArmEnum != Arm.JudgeArm)
|
.WhereIf(taskInfo.ArmEnum != Arm.JudgeArm, x => x.ArmEnum != Arm.JudgeArm)
|
||||||
.Where(x=>x.IsAnalysisCreate== taskInfo.IsAnalysisCreate)
|
.Where(x=>x.IsAnalysisCreate== taskInfo.IsAnalysisCreate)
|
||||||
|
.Where(x=>x.TaskState==TaskState.Effect)
|
||||||
.Where(x => x.SubjectId == taskInfo.SubjectId
|
.Where(x => x.SubjectId == taskInfo.SubjectId
|
||||||
&& x.DoctorUserId == taskInfo.DoctorUserId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ReReadingApplyState != ReReadingApplyState.Agree
|
&& x.DoctorUserId == taskInfo.DoctorUserId &&
|
||||||
|
x.ReadingTaskState == ReadingTaskState.HaveSigned &&
|
||||||
|
x.ReReadingApplyState != ReReadingApplyState.Agree
|
||||||
).OrderBy(x => x.VisitTaskNum).Select(x => new TaskInfo()
|
).OrderBy(x => x.VisitTaskNum).Select(x => new TaskInfo()
|
||||||
{
|
{
|
||||||
TaskId = x.Id,
|
TaskId = x.Id,
|
||||||
|
|
Loading…
Reference in New Issue