From 2c3483fa4ee63500af75a97fb46601d5d3993739 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Tue, 19 Aug 2025 15:37:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IRaCIS.Core.Application.xml               | 25 +++++++++++++------
 .../MRECISTHCCCalculateService.cs             | 21 ++++++++--------
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 063ab32fc..6e72d2ffc 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -13726,14 +13726,6 @@
             <param name="_readingConsistentClinicalDataRepository"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.TestService.OldTrialDeleteUser(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialIdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole})">
-            <summary>
-            项目退出历史数据维护
-            </summary>
-            <param name="_trialIdentityUserRepository"></param>
-            <param name="_trialUserRoleReposiotry"></param>
-            <returns></returns>
-        </member>
         <member name="M:IRaCIS.Core.Application.Service.TestService.UserMutiAccount(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.IdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserPassWordLog})">
             <summary>
             用户多账号，初次维护数据
@@ -13747,6 +13739,23 @@
             <param name="_trialIdentityUserRepository"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.TestService.OldTrialDeleteUser(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialIdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole})">
+            <summary>
+            项目退出历史数据维护
+            </summary>
+            <param name="_trialIdentityUserRepository"></param>
+            <param name="_trialUserRoleReposiotry"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.TestService.OldSCPStudyHospitalGroup(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SCPStudyHospitalGroup},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SCPStudy},System.Guid)">
+            <summary>
+            给影像库所有检查 打上课题组标签
+            </summary>
+            <param name="_SCPStudyHospitalGroupRepository"></param>
+            <param name="_SCPStudyRepository"></param>
+            <param name="hospitalGroupId"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.TestService.ExternalTrialUser(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSiteUserSurvey},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialExternalUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserRole})">
             <summary>
             外部人员 中心调研人员维护
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs
index ffa9241ee..0fe1e81a2 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs
@@ -732,14 +732,13 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 // 判断当前任务是是否有表格问题答案
                 if (!(await _readingTableQuestionAnswerRepository.AnyAsync(x => x.VisitTaskId == visitTaskId)))
                 {
-
                     var LastVisitTaskId = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&
-                    x.TrialReadingCriterionId == taskinfo.TrialReadingCriterionId &&
-                    x.IsAnalysisCreate == taskinfo.IsAnalysisCreate &&
-                     x.DoctorUserId == taskinfo.DoctorUserId &&
-                     x.IsSelfAnalysis == taskinfo.IsSelfAnalysis &&
-                    x.SubjectId == taskinfo.SubjectId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.VisitTaskNum < taskinfo.VisitTaskNum && x.TaskState == TaskState.Effect && x.ArmEnum == taskinfo.ArmEnum
-                    ).OrderByDescending(x => x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync();
+                                    x.TrialReadingCriterionId == taskinfo.TrialReadingCriterionId &&
+                                    x.IsAnalysisCreate == taskinfo.IsAnalysisCreate &&
+                                     x.ArmEnum == taskinfo.ArmEnum &&
+                                     x.IsSelfAnalysis == taskinfo.IsSelfAnalysis &&
+                                    x.SubjectId == taskinfo.SubjectId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.VisitTaskNum < taskinfo.VisitTaskNum && x.TaskState == TaskState.Effect && x.ArmEnum == taskinfo.ArmEnum
+                                    ).OrderByDescending(x => x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync();
 
 
 
@@ -823,8 +822,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 x.ReadingTaskState == ReadingTaskState.HaveSigned &&
                 x.TrialReadingCriterion.CriterionType == CriterionType.RECIST1Point1 &&
                 x.SubjectId == taskinfo.SubjectId &&
-                x.SourceSubjectVisitId == taskinfo.SourceSubjectVisitId &&
-                x.DoctorUserId==taskinfo.DoctorUserId).FirstOrDefaultAsync();
+                x.SourceSubjectVisitId == taskinfo.SourceSubjectVisitId 
+                //&&
+                //x.DoctorUserId==taskinfo.DoctorUserId
+                ).FirstOrDefaultAsync();
                 if (recistTask != null)
                 {
                     _userInfo.AuditIdentification = "HCC";
@@ -1622,7 +1623,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                                                                   x.SourceSubjectVisit.IsBaseLine && x.TaskState == TaskState.Effect &&
                                                                   x.IsAnalysisCreate == inDto.IsAnalysisCreate
-                                                                  && x.DoctorUserId == inDto.DoctorUserId
+                                                                  //&& x.DoctorUserId == inDto.DoctorUserId
                                                                   && x.IsSelfAnalysis == inDto.IsSelfAnalysis && x.ArmEnum == inDto.ArmEnum)
                                                                    .Select(x => x.Id).FirstOrDefaultAsync();