From de04d51cd74e29bc14da508bd8fe7b653c971cb5 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 21 Mar 2023 17:55:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=98=85=E7=89=87=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Allocation/VisitTaskService.cs                | 8 +++++---
 .../Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs       | 6 ++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index 47ae89828..01a5f77e1 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -90,11 +90,12 @@ namespace IRaCIS.Core.Application.Service.Allocation
             return await _visitTaskRepository.SaveChangesAsync();
         }
 
-        public async Task<List<TrialReadingCriterionDto>> GetTrialCriterionList(Guid trialId, bool isHaveSigned = true)
+        public async Task<List<TrialReadingCriterionDto>> GetTrialCriterionList(Guid trialId, bool isHaveSigned = true,bool? isAutoCreate = null)
         {
             var list = await _repository.Where<ReadingQuestionCriterionTrial>(t => t.TrialId == trialId && t.IsConfirm)
+              
                 .OrderBy(t => t.ShowOrder)
-                .Select(t => new TrialReadingCriterionDto() { TrialReadingCriterionId = t.Id, TrialReadingCriterionName = t.CriterionName, CriterionType = t.CriterionType, ReadingType = t.ReadingType, ReadingInfoSignTime = t.ReadingInfoSignTime })
+                .Select(t => new TrialReadingCriterionDto() { TrialReadingCriterionId = t.Id, IsAutoCreate=t.IsAutoCreate,IsAdditionalAssessment=t.IsAdditionalAssessment, TrialReadingCriterionName = t.CriterionName, CriterionType = t.CriterionType, ReadingType = t.ReadingType, ReadingInfoSignTime = t.ReadingInfoSignTime })
                 .ToListAsync();
 
             if (list.Count == 0)
@@ -106,7 +107,8 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
 
 
-            return list.AsQueryable().WhereIf(isHaveSigned == true, t => t.ReadingInfoSignTime != null).ToList();
+            return list.AsQueryable().WhereIf(isHaveSigned == true, t => t.ReadingInfoSignTime != null)
+                 .WhereIf(isAutoCreate == false, t => t.IsAutoCreate == isAutoCreate).ToList();
         }
 
 
diff --git a/IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs b/IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs
index fe2a4b76e..093c7a829 100644
--- a/IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs
+++ b/IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs
@@ -343,6 +343,12 @@ namespace IRaCIS.Application.Contracts
 
         public bool IsGlobalReading { get; set; } = true;
 
+        //是否附加评估
+        public bool IsAdditionalAssessment { get; set; }
+
+
+        //自动  手动生成任务
+        public bool IsAutoCreate { get; set; }
 
         public bool IsArbitrationReading { get; set; } = true;