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

修改一版

Uat_Study
he 2022-07-06 14:05:07 +08:00
parent 5180fe2ba5
commit fe2bc9d5d6
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,6 +82,7 @@ namespace IRaCIS.Core.Application.Service
medicalReviewInfo.TaskList = await _visitTaskRepository medicalReviewInfo.TaskList = await _visitTaskRepository
.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.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()
@ -102,7 +103,9 @@ namespace IRaCIS.Core.Application.Service
List<TaskInfo> otherTask = await _visitTaskRepository.Where(x => x.ArmEnum != Arm.JudgeArm && x.SubjectId == taskInfo.SubjectId List<TaskInfo> otherTask = await _visitTaskRepository.Where(x => x.ArmEnum != Arm.JudgeArm && 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() )
.Where(x => x.IsAnalysisCreate == taskInfo.IsAnalysisCreate)
.OrderBy(x => x.VisitTaskNum).Select(x => new TaskInfo()
{ {
TaskId = x.Id, TaskId = x.Id,
IsCurrentTask = x.Id == taskInfo.Id, IsCurrentTask = x.Id == taskInfo.Id,
@ -138,7 +141,9 @@ namespace IRaCIS.Core.Application.Service
List<TaskInfo> otherTask = await _visitTaskRepository.Where(x => x.ArmEnum != Arm.JudgeArm && x.SouceReadModuleId == taskInfo.SouceReadModuleId && x.SourceSubjectVisitId == taskInfo.SourceSubjectVisitId List<TaskInfo> otherTask = await _visitTaskRepository.Where(x => x.ArmEnum != Arm.JudgeArm && x.SouceReadModuleId == taskInfo.SouceReadModuleId && x.SourceSubjectVisitId == taskInfo.SourceSubjectVisitId
&& 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() )
.Where(x => x.IsAnalysisCreate == taskInfo.IsAnalysisCreate)
.OrderBy(x => x.VisitTaskNum).Select(x => new TaskInfo()
{ {
TaskId = x.Id, TaskId = x.Id,
IsCurrentTask = x.Id == taskInfo.Id, IsCurrentTask = x.Id == taskInfo.Id,
@ -362,7 +367,8 @@ namespace IRaCIS.Core.Application.Service
{ {
x.SaveConclusionTime, x.SaveConclusionTime,
x.SaveQuestionTime, x.SaveQuestionTime,
x.IsClosedDialog x.IsClosedDialog,
x.IsHaveQuestion
}).FirstNotNullAsync(); }).FirstNotNullAsync();
@ -372,7 +378,7 @@ namespace IRaCIS.Core.Application.Service
} }
if (!taskmedicalReview.IsClosedDialog) if (taskmedicalReview.IsHaveQuestion&&!taskmedicalReview.IsClosedDialog)
{ {
throw new BusinessValidationFailedException("对话未关闭"); throw new BusinessValidationFailedException("对话未关闭");

10
IRaCIS.Core.Domain/Allocation/VisitTask.cs
View File

@ -115,10 +115,16 @@ namespace IRaCIS.Core.Domain.Models
public DateTime? SuggesteFinishedTime { get; set; } public DateTime? SuggesteFinishedTime { get; set; }
//是否是重阅产生的，方便过滤数据
/// <summary>
/// 是否是重阅产生的，方便过滤数据
/// </summary>
public bool IsReReadingCreate { get; set; } public bool IsReReadingCreate { get; set; }
//是否是一致性分析产生
/// <summary>
/// 是否是一致性分析产生
/// </summary>
public bool IsAnalysisCreate { get; set; } public bool IsAnalysisCreate { get; set; }