From 61b67b935a9d2d77fc3a28b8d5167a1649f7e1f0 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 2 Jul 2025 16:31:57 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=BF=E8=A7=86=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Triggers/SubjectVisitScanDateTrigger.cs   | 38 +++++++++++--------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/IRaCIS.Core.Application/Triggers/SubjectVisitScanDateTrigger.cs b/IRaCIS.Core.Application/Triggers/SubjectVisitScanDateTrigger.cs
index 977643b74..2da80e41a 100644
--- a/IRaCIS.Core.Application/Triggers/SubjectVisitScanDateTrigger.cs
+++ b/IRaCIS.Core.Application/Triggers/SubjectVisitScanDateTrigger.cs
@@ -25,10 +25,6 @@ namespace IRaCIS.Core.Application.Triggers
             {
                 await UpdateSubjectVisitImageDateAsync(context.Entity.SubjectVisitId);
 
-                await _subjectVisitRepository.BatchUpdateNoTrackingAsync(t => t.Id == subjectVisitId, u => new SubjectVisit()
-                {
-                    VisitExecuted = VisitExecutedEnum.Executed
-                });
                 await UpdateSubjectVisitSubmitStateAsync(subjectVisitId);
             }
 
@@ -56,11 +52,6 @@ namespace IRaCIS.Core.Application.Triggers
 
                 context.Entity.Modalities = ModaliyStr;
 
-                await _subjectVisitRepository.BatchUpdateNoTrackingAsync(t => t.Id == subjectVisitId, u => new SubjectVisit()
-                {
-                    VisitExecuted = VisitExecutedEnum.Executed
-                });
-
                 await UpdateSubjectVisitSubmitStateAsync(subjectVisitId);
 
                 //添加检查级别临床数据
@@ -122,7 +113,7 @@ namespace IRaCIS.Core.Application.Triggers
             {
 
                 await _subjectVisitRepository.UpdatePartialFromQueryAsync(t => t.Id == subjectVisitId && t.SubmitState == SubmitStateEnum.ToSubmit,
-                    u => new SubjectVisit() { VisitExecuted = 0, SVENDTC = null, SVSTDTC = null, SubmitState = SubmitStateEnum.None }, true);
+                    u => new SubjectVisit() { VisitExecuted = VisitExecutedEnum.UnExecuted, SVENDTC = null, SVSTDTC = null, SubmitState = SubmitStateEnum.None }, true);
             }
             else
             {
@@ -131,11 +122,11 @@ namespace IRaCIS.Core.Application.Triggers
             }
         }
 
-       /// <summary>
-       /// 处理访视拍片日期
-       /// </summary>
-       /// <param name="subjectVisitId"></param>
-       /// <returns></returns>
+        /// <summary>
+        /// 处理访视拍片日期
+        /// </summary>
+        /// <param name="subjectVisitId"></param>
+        /// <returns></returns>
         private async Task UpdateSubjectVisitImageDateAsync(Guid subjectVisitId)
         {
             var svTime = _subjectVisitRepository.Where(t => t.Id == subjectVisitId).Select(t => new
@@ -157,6 +148,23 @@ namespace IRaCIS.Core.Application.Triggers
 
                 LatestScanDate = maxArray.Max()
             });
+
+            if (minArray.Min() == null && maxArray.Max() == null)
+            {
+                await _subjectVisitRepository.BatchUpdateNoTrackingAsync(t => t.Id == subjectVisitId, u => new SubjectVisit()
+                {
+                    VisitExecuted = VisitExecutedEnum.UnExecuted
+                });
+            }
+            else
+            {
+
+
+                await _subjectVisitRepository.BatchUpdateNoTrackingAsync(t => t.Id == subjectVisitId, u => new SubjectVisit()
+                {
+                    VisitExecuted = VisitExecutedEnum.Executed
+                });
+            }
         }
     }
 }
\ No newline at end of file

From 8f5d391c0d119e2bf218d210b732559330527073 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 2 Jul 2025 16:43:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9pcwg=20=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Document/TrialEmailNoticeConfigService.cs     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
index ed3b19658..46bae4d87 100644
--- a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
+++ b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
@@ -622,8 +622,8 @@ namespace IRaCIS.Core.Application.Service
 
                 var value = new Dictionary<string, object>()
                 {
-                    ["Criterion_Enroll_Replace"]= enrollReplace,
-                    ["Criterion_PD_Replace"]= PdReplace,
+                    ["Criterion_Enroll_Replace"] = enrollReplace,
+                    ["Criterion_PD_Replace"] = PdReplace,
                     ["SponsorName"] = taskInfo.SponsorName,
                     ["ResearchProgramNo"] = taskInfo.ResearchProgramNo,
                     ["TrialSiteCode"] = taskInfo.TrialSiteCode,
@@ -1090,7 +1090,7 @@ namespace IRaCIS.Core.Application.Service
                     var list = await _readingTableQuestionAnswerRepository.Where(x => x.VisitTaskId == visitTaskId &&
 x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.LesionNumber && x.ReadingQuestionTrial.LesionType == LesionType.BaselineLesions).Select(t => t.Answer).ToListAsync();
 
-                    bool exists = list.Any(s => int.TryParse(s, out var n) && n > 100);
+                    bool exists = list.Any(s => int.TryParse(s, out var n) && n >= 1);
                     if (exists)
                     {
                         enrollAnswer = _userInfo.IsEn_Us ? "Yes" : "是";
@@ -1348,7 +1348,7 @@ x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.LesionNumber && x.Readi
                     if (answer == OverallAssessment.PD.GetEnumInt())
                     {
                         answer = _userInfo.IsEn_Us ? "Yes" : "是";
-                    }                
+                    }
                     else
                     {
                         answer = _userInfo.IsEn_Us ? "No" : "否";