From 040777ec87dc04ee82eb9dad4c96d063eb912cbe Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 14 Nov 2024 17:22:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Allocation/DTO/VisitTaskViewModel.cs         | 4 +++-
 .../Service/Allocation/VisitTaskService.cs               | 9 ++-------
 irc_api.drone.yml                                        | 2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
index b253fb01c..a38dbe7f5 100644
--- a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
@@ -522,7 +522,7 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public string? SubjectCode { get; set; } = null;
 
-
+        public string? SubjectName { get; set; }
         public string? PatientName { get; set; }
         public string? PatientIdStr { get; set; }
 
@@ -535,6 +535,8 @@ namespace IRaCIS.Core.Application.ViewModel
         public DateTime? BeginSignDate { get; set; }
 
         public DateTime? EndSignDate { get; set; }
+
+        public string? SubjectName { get; set; }
         #endregion
 
         [NotDefault]
diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index 9b015371f..d9e130b5d 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -1266,12 +1266,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
            // 前序 不存在 未一致性核查未通过的
            .Where(t => !t.Subject.SubjectVisitList.Any(sv => sv.CheckState != CheckStateEnum.CVPassed && t.VisitTaskNum >= sv.VisitNum))
-           //.WhereIf(critrion.IsAutoCreate == false, t => t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId).Any(t => t.IsGeneratedTask == false) ?
-           //t.VisitTaskNum <= t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId && t.IsGeneratedTask == false).Min(t => t.SubjectVisit.VisitNum) : true)
-           //.Where(t => t.Subject.SubjectVisitList.Any(t => t.CheckState != CheckStateEnum.CVPassed) ? t.VisitTaskNum <= t.Subject.SubjectVisitList.Where(t => t.CheckState != CheckStateEnum.CVPassed).Min(t => t.VisitNum) : true)
-           //满足前序访视不存在 需要签署但是未签署  sql  相当复杂    同时想查询所有未读的统计数字 就无法统计   byzhouhang  
-           //但是加字段 IsFrontTaskNeedSignButNotSign   那么签名临床数据的时候，要对该subject 该标准的有效的任务  这个字段需要在签名的时候维护   采取这种方式   统计数字灵活
-           //.Where(t => t.Subject.SubjectVisitTaskList.AsQueryable().Where(visitTaskLambda).Any(c => c.IsNeedClinicalDataSign == true && c.IsClinicalDataSign == false && c.VisitTaskNum < t.VisitTaskNum))
+           .WhereIf(!string.IsNullOrWhiteSpace(inQuery.SubjectName), t => t.Subject.ShortName.Contains(inQuery.SubjectName))
            .WhereIf(!string.IsNullOrEmpty(inQuery.SubjectCode), t => (t.Subject.Code.Contains(inQuery.SubjectCode!) && t.IsAnalysisCreate == false) || (t.BlindSubjectCode.Contains(inQuery.SubjectCode!) && t.IsAnalysisCreate));
 
 
@@ -1486,7 +1481,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
               .WhereIf(inQuery.PIAuditState != null, t => t.PIAuditState == inQuery.PIAuditState)
               .WhereIf(inQuery.BeginSignDate != null, t => t.SignTime >= inQuery.BeginSignDate)
               .WhereIf(inQuery.EndSignDate != null, t => t.SignTime <= inQuery.EndSignDate)
-
+               .WhereIf(!string.IsNullOrWhiteSpace(inQuery.SubjectName), t => t.Subject.ShortName.Contains(inQuery.SubjectName))
             //.WhereIf(inQuery.TrialSiteId != null, t => t.Subject.TrialSiteId == inQuery.TrialSiteId)
             .WhereIf(inQuery.SubjectId != null, t => t.SubjectId == inQuery.SubjectId)
             .WhereIf(inQuery.IsUrgent != null, t => t.IsUrgent == inQuery.IsUrgent)
diff --git a/irc_api.drone.yml b/irc_api.drone.yml
index c0a5825c6..2226803b4 100644
--- a/irc_api.drone.yml
+++ b/irc_api.drone.yml
@@ -50,7 +50,7 @@ steps:
   
 trigger:
   branch:
-    - Test_IRC_Net8—_SCP_Disable    
+    - Test_IRC_Net8