From 34ff47bc1c927e5f14f2acd81889bdbb5b9fe777 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Thu, 10 Apr 2025 14:01:06 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Document/AuditDocumentService.cs                | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Document/AuditDocumentService.cs b/IRaCIS.Core.Application/Service/Document/AuditDocumentService.cs
index efed114e2..08b2cd225 100644
--- a/IRaCIS.Core.Application/Service/Document/AuditDocumentService.cs
+++ b/IRaCIS.Core.Application/Service/Document/AuditDocumentService.cs
@@ -208,7 +208,11 @@ public class AuditDocumentService(IRepository<AuditDocument> _auditDocumentRepos
 	{
 
         var defalutSortArray = new string[] { nameof(AuditDocumentData.AuditDocumentTypeEnum), nameof(AuditDocumentData.Name) };
-
+        if (inDto.SortField.IsNotNullOrEmpty())
+        {
+            defalutSortArray = new string[] { nameof(AuditDocumentData.AuditDocumentTypeEnum), inDto.SortField + (inDto.Asc ? " asc" : " desc") };
+            inDto.SortField = string.Empty;
+        }
 		// 新取出来排序 然后再找子项
         var data=  (await _auditDocumentRepository
 			.Where(x=>x.AuditDocumentTypeEnum!=AuditDocumentType.HistoricalVersion)

From faf87f5b86ab3a95972d2b9beb18c36413e1b485 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Thu, 10 Apr 2025 17:30:09 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs b/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs
index 8ad101753..d4e935822 100644
--- a/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs
@@ -435,7 +435,7 @@ namespace IRaCIS.Core.Application.Service
 
 
                 //变更某一访视计划Item  受试者访视相关字段
-                await _subjectVisitRepository.BatchUpdateNoTrackingAsync(t => t.TrialId == trialId && t.VisitStageId == changedItem.Id, k => new SubjectVisit()
+                await _subjectVisitRepository.UpdatePartialFromQueryAsync(t => t.TrialId == trialId && t.VisitStageId == changedItem.Id, k => new SubjectVisit()
                 {
                     IsBaseLine = changedItem.IsBaseLine,
                     VisitName = changedItem.VisitName,

From 81abd9622f3a5d1d284ddd87bd28076e3b66d159 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Fri, 11 Apr 2025 10:10:46 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=97=85=E7=81=B6?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReadingImageTask/ReadingImageTaskService.cs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 88e5c54d6..6e1065bc5 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -52,6 +52,7 @@ namespace IRaCIS.Core.Application.Service
         IRepository<ReadModule> _readModuleRepository,
         IRepository<DicomInstance> _dicomInstanceRepository,
         IRepository<OrganInfo> _organInfoRepository,
+          IRepository<OrganTrialInfo> _organTrialInfoRepository,
         IRepository<TrialDocument> _trialDocumentRepository,
         ILuganoCalculateService _luganoCalculateService,
         IRepository<ReadingCustomTag> _readingCustomTagRepository,
@@ -2391,6 +2392,22 @@ namespace IRaCIS.Core.Application.Service
 
 
 
+                    break;
+
+                case CriterionType.mRECISTHCC:
+
+                    var orginInfo=await _organTrialInfoRepository.Where(x =>x.TrialCriterionId== taskinfo.TrialReadingCriterionId&& x.OrganInfoId == inDto.OrganInfoId).FirstOrDefaultAsync();
+
+                    if (orginInfo != null && orginInfo.TULOCEN == "Liver")
+                    {
+                       var otherorganCount=await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.QuestionId == inDto.QuestionId && x.Id!=inDto.Id&&x.OrganInfo.TULOCEN == "Liver").CountAsync();
+                        if (otherorganCount >=2)
+                        {
+                            throw new BusinessValidationFailedException(_localizer["ReadingImageTask_HCCOrganRepeat"]);
+                        }
+
+                    }
+                   
                     break;
             }
             var questionInfo = await _readingQuestionTrialRepository.Where(x => x.Id == inDto.QuestionId).FirstNotNullAsync();