From c9046e97b7de2f2a65e0f9eceeb26e0a06805547 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 7 Jul 2022 16:55:08 +0800
Subject: [PATCH] x

---
 .../Allocation/DTO/TaskMedicalReviewViewModel.cs   | 14 +++++++-------
 .../Allocation/TaskConsistentRuleService.cs        |  3 +++
 .../Service/Allocation/TaskMedicalReviewService.cs |  4 +++-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/TaskMedicalReviewViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/TaskMedicalReviewViewModel.cs
index 460e09aae..591e64bda 100644
--- a/IRaCIS.Core.Application/Service/Allocation/DTO/TaskMedicalReviewViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/DTO/TaskMedicalReviewViewModel.cs
@@ -52,8 +52,8 @@ namespace IRaCIS.Core.Application.ViewModel
             {
                 if (!ReadingDurationTimeSpan.HasValue)
                     return "";
-                else return /*string.Format("{0}天{1}小时{2}分钟", (SignTime - FirstReadingTime)?.Days, (SignTime - FirstReadingTime)?.Hours, (SignTime - FirstReadingTime)?.Minutes)*/
-                         string.Format("{0}分钟", (ReadingDurationTimeSpan)?.TotalMinutes);
+                else return string.Format("{0}天{1}小时{2}分钟", (SignTime - FirstReadingTime)?.Days, (SignTime - FirstReadingTime)?.Hours, (SignTime - FirstReadingTime)?.Minutes)
+                         /*string.Format("{0}分钟", (ReadingDurationTimeSpan)?.TotalMinutes)*/;
             }
         }
 
@@ -90,12 +90,12 @@ namespace IRaCIS.Core.Application.ViewModel
 
     }
 
-    //public class GenerateMedicalReviewTaskQuery : TaskMedicalReviewQuery
-    //{
-    //    public bool? IsGeneratedJudge { get; set; }
+    public class GenerateMedicalReviewTaskQuery : TaskMedicalReviewQuery
+    {
+        public bool? IsGeneratedJudge { get; set; }
 
-    //    public bool? IsGlobalHaveUpdate { get; set; }
-    //}
+        public bool? IsGlobalHaveUpdate { get; set; }
+    }
 
 
 
diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs
index 6061a2206..7f261aa76 100644
--- a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs
@@ -302,6 +302,9 @@ namespace IRaCIS.Core.Application.Service
                             VerifyMsg = "已有该医生配置，不允许继续增加"
                         };
 
+                        addOrEdit.AnalysisDoctorUserId = doctor.DoctorUserId;
+                        addOrEdit.Id = Guid.Empty ;
+
                         var entity = await _taskConsistentRuleRepository.InsertOrUpdateAsync(addOrEdit, true, verifyExp1);
                     }
                 }
diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs
index 6e51a80f6..8d249a075 100644
--- a/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs
@@ -72,7 +72,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="inQuery"></param>
         /// <returns></returns>
         [HttpPost]
-   public async Task<PageOutput<GenerateMedicalReviewTaskView>> GetGenerateMedicalReviewTaskList(TaskMedicalReviewQuery inQuery)
+   public async Task<PageOutput<GenerateMedicalReviewTaskView>> GetGenerateMedicalReviewTaskList(GenerateMedicalReviewTaskQuery inQuery)
         {
             var visitTaskQueryable = _visitTaskRepository.Where(t => t.TrialId == inQuery.TrialId)
                .Where(t => t.IsAnalysisCreate == false && t.TaskState == TaskState.Effect && t.ReadingTaskState == ReadingTaskState.HaveSigned)
@@ -83,6 +83,8 @@ namespace IRaCIS.Core.Application.Service
               .WhereIf(inQuery.DoctorUserId != null, t => t.DoctorUserId == inQuery.DoctorUserId)
               .WhereIf(inQuery.ReadingCategory != null, t => t.ReadingCategory == inQuery.ReadingCategory)
               .WhereIf(inQuery.ReadingTaskState != null, t => t.ReadingTaskState == inQuery.ReadingTaskState)
+               .WhereIf(inQuery.IsGeneratedJudge != null, t => t.JudgeVisitTaskId != null)
+                //.WhereIf(inQuery.IsGlobalHaveUpdate != null, t => t.JudgeVisitTaskId != null)
               .WhereIf(!string.IsNullOrEmpty(inQuery.TaskName), t => t.TaskName.Contains(inQuery.TaskName) || t.TaskBlindName.Contains(inQuery.TaskName))
               .WhereIf(!string.IsNullOrEmpty(inQuery.SubjectCode), t => t.Subject.Code.Contains(inQuery.SubjectCode))