From 98d09886de46c292ebf323901a19bb8914af6511 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 30 Nov 2023 18:08:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AD=A6=E5=91=8A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Helper/SendEmailHelper.cs                 |  2 +-
 .../TrialSiteUser/PersonalWorkstation.cs      | 20 ++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/IRaCIS.Core.Application/Helper/SendEmailHelper.cs b/IRaCIS.Core.Application/Helper/SendEmailHelper.cs
index 57cb50bc1..8cffab084 100644
--- a/IRaCIS.Core.Application/Helper/SendEmailHelper.cs
+++ b/IRaCIS.Core.Application/Helper/SendEmailHelper.cs
@@ -40,7 +40,7 @@ public static class SendEmailHelper
 
             }
         }
-        catch (Exception ex)
+        catch (Exception )
         {
 
             //---邮件发送失败，您进行的操作未能成功，请检查邮箱或联系维护人员
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
index 1ba89aa30..6f7eea399 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
@@ -48,7 +48,7 @@ namespace IRaCIS.Core.Application
                 //正参与的数量
                 TrialCount = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin
                     ? await _trialRepository.CountAsync()
-                    : await _trialUserRepository.Where(t => t.UserId == _userInfo.Id && t.Trial.IsDeleted==false).CountAsync(),
+                    : await _trialUserRepository.Where(t => t.UserId == _userInfo.Id && t.Trial.IsDeleted == false).CountAsync(),
 
                 DeletedCount = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin
                     ? await _trialRepository.AsQueryable(true).CountAsync(t => t.IsDeleted)
@@ -366,6 +366,7 @@ namespace IRaCIS.Core.Application
         /// </summary>
         /// <param name="inQuery"></param>
         /// <param name="_subjectVisitRepository"></param>
+        /// <param name="_trialRepository"></param>
         /// <returns></returns>
         [HttpPost]
         public async Task<IResponseOutput<PageOutput<ImageClinicalDataToBeDoneDto>>> GetImageClinicalDataToBeDoneList(ImageClinicalDataToBeDoneQuery inQuery,
@@ -407,6 +408,7 @@ namespace IRaCIS.Core.Application
         /// </summary>
         /// <param name="inQuery"></param>
         /// <param name="_subjectVisitRepository"></param>
+        /// <param name="_trialRepository"></param>
         /// <returns></returns>
         [HttpPost]
         public async Task<IResponseOutput<PageOutput<ImageClinicalDataToBeDoneDto>>> GetImageClinicalDataToBeConfirmList(ImageClinicalDataToBeDoneQuery inQuery,
@@ -500,6 +502,7 @@ namespace IRaCIS.Core.Application
         /// </summary>
         /// <param name="inQuery"></param>
         /// <param name="_subjectVisitRepository"></param>
+        /// <param name="_trialRepository"></param>
         /// <returns></returns>
         [HttpPost]
         public async Task<IResponseOutput<PageOutput<ImageCheckQuestionToBeDoneDto>>> GetImageCheckQuestionToBeDoneList(ImageCheckQuestionToBeDoneQuery inQuery,
@@ -540,12 +543,12 @@ namespace IRaCIS.Core.Application
 
         }
 
-
         /// <summary>
         /// 影像重传  --CRC 待办
         /// </summary>
         /// <param name="inQuery"></param>
         /// <param name="_subjectVisitRepository"></param>
+        /// <param name="_trialRepository"></param>
         /// <returns></returns>
         [HttpPost]
         public async Task<IResponseOutput<PageOutput<ImageReUploadToBeDoneDto>>> GetImageReUploadToBeDoneList(ImageReUploadToBeDoneQuery inQuery,
@@ -588,10 +591,11 @@ namespace IRaCIS.Core.Application
 
 
         /// <summary>
-        /// 加急影像提交   --CRC 待办
+        ///  加急影像提交   --CRC 待办
         /// </summary>
         /// <param name="inQuery"></param>
         /// <param name="_subjectVisitRepository"></param>
+        /// <param name="_trialRepository"></param>
         /// <returns></returns>
         [HttpPost]
         public async Task<IResponseOutput<PageOutput<ImageSubmittedToBeDoneDto>>> GetImageSubmittedToBeDoneList(ImageSubmittedToBeDoneQuery inQuery,
@@ -647,6 +651,7 @@ namespace IRaCIS.Core.Application
         /// </summary>
         /// <param name="inQuery"></param>
         /// <param name="_subjectVisitRepository"></param>
+        /// <param name="_trialRepository"></param>
         /// <returns></returns>
         [HttpPost]
         public async Task<IResponseOutput<PageOutput<ImageQualityToBeDoneDto>>> GetImageQualityToBeDoneList(ImageQualityToBeDoneQuery inQuery,
@@ -669,7 +674,7 @@ namespace IRaCIS.Core.Application
 
 
                     //待领取量
-                    ToBeClaimedCount = t.SubjectVisitList.Where(u => u.CurrentActionUserId == null && (u.PreliminaryAuditUserId == null || (u.PreliminaryAuditUserId != _userInfo.Id && u.ReviewAuditUserId == null))).Count(),
+                    ToBeClaimedCount = t.SubjectVisitList.Where(t => t.SubmitState == SubmitStateEnum.Submitted).Where(u => u.CurrentActionUserId == null && (u.PreliminaryAuditUserId == null || (u.PreliminaryAuditUserId != _userInfo.Id && u.ReviewAuditUserId == null))).Count(),
 
                     //待审核通过，统计从已领取到QC提交之间的      已领取 待审核 审核中   (审核完成  领取人就会清理 所以只用查询当前领取人是自己的就好了)
                     ToBeReviewedCount = t.SubjectVisitList.Where(u => u.CurrentActionUserId == _userInfo.Id).Count()
@@ -698,10 +703,11 @@ namespace IRaCIS.Core.Application
 
 
         /// <summary>
-        /// QC 质疑
+        ///  QC 质疑
         /// </summary>
         /// <param name="inQuery"></param>
         /// <param name="_subjectVisitRepository"></param>
+        /// <param name="_trialRepository"></param>
         /// <returns></returns>
         [HttpPost]
         public async Task<IResponseOutput<PageOutput<ImageQuestionToBeDoneDto>>> GetQCImageQuestionToBeDoneList(ImageQuestionToBeDoneQuery inQuery,
@@ -892,7 +898,7 @@ namespace IRaCIS.Core.Application
         /// IR医学反馈 
         /// </summary>
         /// <param name="inQuery"></param>
-
+        /// <param name="_taskMedicalReviewRepository"></param>
         /// <returns></returns>
         [HttpPost]
         public async Task<IResponseOutput<PageOutput<MedicalCommentsToBeDoneDto>>> GetIRMedicalCommentsToBeDoneList(MedicalCommentsToBeDoneQuery inQuery,
@@ -966,7 +972,7 @@ namespace IRaCIS.Core.Application
         /// </summary>
         /// <param name="inQuery"></param>
         /// <param name="_taskMedicalReviewRepository"></param>
-
+        /// <param name="_trialReadingCriterionRepository"></param>
         /// <returns></returns>
         [HttpPost]
         public async Task<IResponseOutput<PageOutput<MedicalCommentsToBeDoneDto>>> GetMIMMedicalCommentsToBeDoneList(MedicalCommentsToBeDoneQuery inQuery,