修改一版
parent
97074287b7
commit
f5a50ebc7f
|
@ -248,11 +248,12 @@
|
||||||
</summary>
|
</summary>
|
||||||
<returns></returns>
|
<returns></returns>
|
||||||
</member>
|
</member>
|
||||||
<member name="M:IRaCIS.Core.Application.Service.VisitTaskService.GetReReadingInfluenceTaskList(System.Guid)">
|
<member name="M:IRaCIS.Core.Application.Service.VisitTaskService.GetReReadingOrBackInfluenceTaskList(System.Guid,System.Boolean)">
|
||||||
<summary>
|
<summary>
|
||||||
重阅影响提示列表 仅仅针对已完成的任务申请
|
影响提示列表 重阅仅仅针对已完成的任务申请 退回针对的是未完成的(退回仅仅针对是访视类型的)
|
||||||
</summary>
|
</summary>
|
||||||
<param name="taskId"></param>
|
<param name="taskId"></param>
|
||||||
|
<param name="isReReading"></param>
|
||||||
<returns></returns>
|
<returns></returns>
|
||||||
</member>
|
</member>
|
||||||
<member name="T:IRaCIS.Core.Application.Service.CommonDocumentService">
|
<member name="T:IRaCIS.Core.Application.Service.CommonDocumentService">
|
||||||
|
|
|
@ -503,7 +503,7 @@ namespace IRaCIS.Application.Services
|
||||||
public async Task<IResponseOutput> SubmitVisitTaskQuestions(SubmitVisitTaskQuestionsInDto inDto)
|
public async Task<IResponseOutput> SubmitVisitTaskQuestions(SubmitVisitTaskQuestionsInDto inDto)
|
||||||
{
|
{
|
||||||
await this.SaveVisitTaskQuestions(inDto);
|
await this.SaveVisitTaskQuestions(inDto);
|
||||||
await _visitTaskRepository.UpdatePartialFromQueryAsync(x => x.Id == inDto.VisitTaskId, x => new VisitTask()
|
await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => x.Id == inDto.VisitTaskId, x => new VisitTask()
|
||||||
{
|
{
|
||||||
ReadingTaskState = ReadingTaskState.HaveSigned,
|
ReadingTaskState = ReadingTaskState.HaveSigned,
|
||||||
SignTime=DateTime.Now,
|
SignTime=DateTime.Now,
|
||||||
|
@ -727,7 +727,7 @@ namespace IRaCIS.Application.Services
|
||||||
{
|
{
|
||||||
if (visitTask.IsAnalysisCreate)
|
if (visitTask.IsAnalysisCreate)
|
||||||
{
|
{
|
||||||
await _visitTaskRepository.UpdatePartialFromQueryAsync(visitTaskId, x => new VisitTask()
|
await _visitTaskRepository.BatchUpdateNoTrackingAsync(x=>x.Id==visitTaskId, x => new VisitTask()
|
||||||
{
|
{
|
||||||
IsAnalysisDiffToOriginalData = true
|
IsAnalysisDiffToOriginalData = true
|
||||||
});
|
});
|
||||||
|
@ -748,7 +748,7 @@ namespace IRaCIS.Application.Services
|
||||||
|
|
||||||
if (visitTask.IsAnalysisCreate)
|
if (visitTask.IsAnalysisCreate)
|
||||||
{
|
{
|
||||||
await _visitTaskRepository.UpdatePartialFromQueryAsync(visitTaskId, x => new VisitTask()
|
await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => x.Id == visitTaskId, x => new VisitTask()
|
||||||
{
|
{
|
||||||
IsAnalysisDiffToOriginalData = false
|
IsAnalysisDiffToOriginalData = false
|
||||||
});
|
});
|
||||||
|
|
|
@ -100,10 +100,8 @@ namespace IRaCIS.Core.Application.Service
|
||||||
SubjectId=x.SubjectId,
|
SubjectId=x.SubjectId,
|
||||||
}).ToListAsync();
|
}).ToListAsync();
|
||||||
|
|
||||||
|
|
||||||
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)
|
||||||
)
|
|
||||||
.Where(x => x.IsAnalysisCreate == taskInfo.IsAnalysisCreate)
|
.Where(x => x.IsAnalysisCreate == taskInfo.IsAnalysisCreate)
|
||||||
.OrderBy(x => x.VisitTaskNum).Select(x => new TaskInfo()
|
.OrderBy(x => x.VisitTaskNum).Select(x => new TaskInfo()
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue