From 923edf166b9cd3a562356f3d11aff4d6e9ea9d94 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 7 Jul 2026 10:20:43 +0800 Subject: [PATCH 1/8] =?UTF-8?q?subject=E7=8A=B6=E6=80=81=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E6=92=A4=E9=94=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Triggers/SubjectTrigger.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/IRaCIS.Core.Application/Triggers/SubjectTrigger.cs b/IRaCIS.Core.Application/Triggers/SubjectTrigger.cs index 9252cca39..6382c2425 100644 --- a/IRaCIS.Core.Application/Triggers/SubjectTrigger.cs +++ b/IRaCIS.Core.Application/Triggers/SubjectTrigger.cs @@ -56,10 +56,10 @@ namespace IRaCIS.Core.Application.Triggers // 出组 状态发生了变更 - if ( context.Entity.Status != context.UnmodifiedEntity?.Status) + if (context.Entity.Status != context.UnmodifiedEntity?.Status) { //设置末次方式 - if (context.Entity.Status == SubjectStatus.OutOfVisit && context.Entity.FinalSubjectVisitId != null ) + if (context.Entity.Status == SubjectStatus.OutOfVisit && context.Entity.FinalSubjectVisitId != null) { if (await _subjectVisitRepository.AnyAsync(t => t.SubjectId == dbSubject.Id && t.IsFinalVisit && t.Id != dbSubject.FinalSubjectVisitId)) { @@ -87,7 +87,7 @@ namespace IRaCIS.Core.Application.Triggers await _subjectVisitRepository.BatchUpdateNoTrackingAsync(t => t.SubjectId == dbSubject.Id && t.VisitNum > sv.VisitNum, u => new SubjectVisit() { VisitExecuted = VisitExecutedEnum.Unavailable }); } //撤销状态 - else if(context.UnmodifiedEntity?.Status== SubjectStatus.OutOfVisit && context.UnmodifiedEntity.FinalSubjectVisitId != null) + else if (context.UnmodifiedEntity?.Status == SubjectStatus.OutOfVisit && context.UnmodifiedEntity.FinalSubjectVisitId != null && context.Entity.Status == SubjectStatus.OnVisit) { var sv = await _subjectVisitRepository.FirstOrDefaultAsync(t => t.Id == context.UnmodifiedEntity.FinalSubjectVisitId).IfNullThrowException(); @@ -100,9 +100,9 @@ namespace IRaCIS.Core.Application.Triggers } } - - - + + + } } From dac5eb0d7d4ef8683980960b1012139e80e50687 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 7 Jul 2026 17:10:16 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A8=BD=E6=9F=A5?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index 98329393d..326b59a51 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -2578,7 +2578,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common if (entity.VisitTaskId != null) { extraIdentification = "/VisitTask"; - var obj = await _dbContext.VisitTask.Where(x => x.Id == entity.VisitTaskId).Select(x => new { x.ArmEnum, x.SourceSubjectVisitId }).FirstOrDefaultAsync(); + var obj = await _dbContext.VisitTask.FindAsync( entity.VisitTaskId); armEnum = obj?.ArmEnum; subjectVisitId = obj.SourceSubjectVisitId; } From 06a60cac3831c040bd702150bd79a41ad3b836f7 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 8 Jul 2026 09:29:21 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=8B=B7=E8=B4=9D=E5=BD=B1=E5=83=8F?= =?UTF-8?q?=E4=B8=8D=E8=B7=9F=E6=8B=B7=E8=B4=9D=E8=A1=A8=E5=8D=95=E7=BB=91?= =?UTF-8?q?=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Allocation/VisitTaskService.cs | 41 +++++++++++-------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs index b7228f2f9..7a02b2197 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs @@ -2190,6 +2190,10 @@ public class VisitTaskService(IRepository _visitTaskRepository, //申请表 设置新任务Id visitTaskReReadingAppply.NewReReadingTaskId = newTask.Id; + + CopyImages(newTask, origenalTask); + + if (visitTaskReReadingAppply.IsCopyOrigenalForms && influenceTask.Id == origenalTask.Id) { if (origenalTask.ReadingCategory == ReadingCategory.Visit) @@ -2228,22 +2232,9 @@ public class VisitTaskService(IRepository _visitTaskRepository, } } - private void CopyForms(VisitTask newTask, VisitTask origenalTask) + + private void CopyImages(VisitTask newTask, VisitTask origenalTask) { - newTask.IsCopyLesionAnswer = true; - //自定义 - //var readingCustomTagList = _readingCustomTagRepository.Where(t => t.VisitTaskId == origenalTask.Id).ToList(); - - //foreach (var item in readingCustomTagList) - //{ - // item.Id = Guid.Empty; - // item.VisitTaskId = newTask.Id; - // item.MeasureData = item.MeasureData.Replace(origenalTask.Id.ToString(), newTask.Id.ToString()); - //} - - //_ = _readingCustomTagRepository.AddRangeAsync(readingCustomTagList).Result; - - //拷贝后处理绑定的的Dicom影像 var newTaskId = newTask.Id; @@ -2315,8 +2306,26 @@ public class VisitTaskService(IRepository _visitTaskRepository, newFile.Id = NewId.NextSequentialGuid(); newFile.VisitTaskId = newTaskId; - _= _noneDicomStudyFileRepository.AddAsync(newFile).Result; + _ = _noneDicomStudyFileRepository.AddAsync(newFile).Result; } + } + private void CopyForms(VisitTask newTask, VisitTask origenalTask) + { + newTask.IsCopyLesionAnswer = true; + //自定义 + //var readingCustomTagList = _readingCustomTagRepository.Where(t => t.VisitTaskId == origenalTask.Id).ToList(); + + //foreach (var item in readingCustomTagList) + //{ + // item.Id = Guid.Empty; + // item.VisitTaskId = newTask.Id; + // item.MeasureData = item.MeasureData.Replace(origenalTask.Id.ToString(), newTask.Id.ToString()); + //} + + //_ = _readingCustomTagRepository.AddRangeAsync(readingCustomTagList).Result; + + + From 5842590f6d0330654e54282c88163bbeb880080e Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 8 Jul 2026 09:35:18 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=B7=E8=B4=9D?= =?UTF-8?q?=E5=BD=B1=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Allocation/VisitTaskService.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs index 7a02b2197..980551835 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs @@ -2079,6 +2079,9 @@ public class VisitTaskService(IRepository _visitTaskRepository, //申请表 设置新任务Id visitTaskReReadingAppply.NewReReadingTaskId = newTask.Id; + CopyImages(newTask, origenalTask); + + //拷贝原始表单 if (visitTaskReReadingAppply.IsCopyOrigenalForms && influenceTask.Id == origenalTask.Id) { @@ -2191,9 +2194,6 @@ public class VisitTaskService(IRepository _visitTaskRepository, visitTaskReReadingAppply.NewReReadingTaskId = newTask.Id; - CopyImages(newTask, origenalTask); - - if (visitTaskReReadingAppply.IsCopyOrigenalForms && influenceTask.Id == origenalTask.Id) { if (origenalTask.ReadingCategory == ReadingCategory.Visit) From 9d54fac8c562ee9667c03b0bfe6bab14ca130675 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 8 Jul 2026 09:36:16 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=97=A0=E5=BA=8F=E9=98=85=E7=89=87?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=8B=B7=E8=B4=9D=E5=90=8E=E7=BB=AD=E8=A1=A8?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Allocation/VisitTaskService.cs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs index 980551835..ca2bfbe35 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs @@ -2203,16 +2203,16 @@ public class VisitTaskService(IRepository _visitTaskRepository, } - //拷贝后续表单 - if (visitTaskReReadingAppply.IsCopyFollowForms && origenalTask.VisitTaskNum != influenceTask.VisitTaskNum) - { - if (origenalTask.ReadingCategory == ReadingCategory.Visit) - { - newTask.IsCopyLesionAnswer = true; - //CopyForms(newTask, origenalTask); + ////拷贝后续表单 + //if (visitTaskReReadingAppply.IsCopyFollowForms && origenalTask.VisitTaskNum != influenceTask.VisitTaskNum) + //{ + // if (origenalTask.ReadingCategory == ReadingCategory.Visit) + // { + // newTask.IsCopyLesionAnswer = true; + // //CopyForms(newTask, origenalTask); - } - } + // } + //} } } }); From dfb0c5a61c939b1e5d4406cd9303928fb2da64fe Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 8 Jul 2026 10:00:18 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=86=99=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Allocation/VisitTaskService.cs | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs index ca2bfbe35..b6c05d2bb 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs @@ -2079,32 +2079,27 @@ public class VisitTaskService(IRepository _visitTaskRepository, //申请表 设置新任务Id visitTaskReReadingAppply.NewReReadingTaskId = newTask.Id; - CopyImages(newTask, origenalTask); - - //拷贝原始表单 - if (visitTaskReReadingAppply.IsCopyOrigenalForms && influenceTask.Id == origenalTask.Id) + if (origenalTask.ReadingCategory == ReadingCategory.Visit) { - if (origenalTask.ReadingCategory == ReadingCategory.Visit) + CopyImages(newTask, origenalTask); + + //拷贝原始表单 + if (visitTaskReReadingAppply.IsCopyOrigenalForms && influenceTask.Id == origenalTask.Id) { CopyForms(newTask, origenalTask); } - } - - //拷贝后续表单 - if (visitTaskReReadingAppply.IsCopyFollowForms && origenalTask.VisitTaskNum != influenceTask.VisitTaskNum) - { - if (origenalTask.ReadingCategory == ReadingCategory.Visit) + //拷贝后续表单 + if (visitTaskReReadingAppply.IsCopyFollowForms && origenalTask.VisitTaskNum != influenceTask.VisitTaskNum) { newTask.IsCopyLesionAnswer = true; - //CopyForms(newTask, origenalTask); } - } + } } From 2bf4e5d8fddcb2144646ac43c9ece17d1fa3332e Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 8 Jul 2026 10:42:21 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E5=90=8D=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs index b6c05d2bb..e8f7478cc 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs @@ -2271,7 +2271,7 @@ public class VisitTaskService(IRepository _visitTaskRepository, foreach (var instance in studyInstanceList) { - var newInstanceId = IdentifierHelper.CreateGuid(newStudy.StudyInstanceUid, newSeries.SeriesInstanceUid, instance.SopInstanceUid, newStudy.TrialId.ToString(), newStudy.ToString()); + var newInstanceId = IdentifierHelper.CreateGuid(newStudy.StudyInstanceUid, newSeries.SeriesInstanceUid, instance.SopInstanceUid, newStudy.TrialId.ToString(), newTaskId.ToString()); var newInstance = instance.Clone(); From 978caf8e9ce9ca9aa7b7a7cea9d91b9ac4f62c63 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 8 Jul 2026 13:56:39 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=B7=E8=B4=9D?= =?UTF-8?q?=E5=BD=B1=E5=83=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.API/appsettings.Prod_Event_IRC.json | 2 +- .../Service/Allocation/VisitTaskService.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/IRaCIS.Core.API/appsettings.Prod_Event_IRC.json b/IRaCIS.Core.API/appsettings.Prod_Event_IRC.json index 1e90a671c..ce4109160 100644 --- a/IRaCIS.Core.API/appsettings.Prod_Event_IRC.json +++ b/IRaCIS.Core.API/appsettings.Prod_Event_IRC.json @@ -7,7 +7,7 @@ } }, "ConnectionStrings": { - "RemoteNew": "Server=101.132.193.237,1433;Database=Prod_IRC_pidr_restore;User ID=sa;Password=xc@123456;TrustServerCertificate=true", + "RemoteNew": "Server=101.132.193.237,1433;Database=Prod_IRC_pidr_restore_new;User ID=sa;Password=xc@123456;TrustServerCertificate=true", "Hangfire": "Server=101.132.193.237,1433;Database=irc_Hangfire_bak;User ID=sa;Password=xc@123456;TrustServerCertificate=true" //"RemoteNew": "Server=prod_mssql_standard,1433;Database=Prod_IRC;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true", //"Hangfire": "Server=prod_mssql_standard,1433;Database=Prod_IRC_Hangfire;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true" diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs index e8f7478cc..09891cf59 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs @@ -2082,7 +2082,7 @@ public class VisitTaskService(IRepository _visitTaskRepository, if (origenalTask.ReadingCategory == ReadingCategory.Visit) { - CopyImages(newTask, origenalTask); + CopyImages(newTask, influenceTask); //拷贝原始表单 if (visitTaskReReadingAppply.IsCopyOrigenalForms && influenceTask.Id == origenalTask.Id) @@ -2275,13 +2275,13 @@ public class VisitTaskService(IRepository _visitTaskRepository, var newInstance = instance.Clone(); - newInstance.Id = newInstanceId; newInstance.SeqId = NewId.NextSequentialGuid(); newInstance.StudyId = newStudyId; newInstance.SeriesId = newSeriesId; newInstance.VisitTaskId = newTaskId; + Console.WriteLine($"StudyInstanceUid:{newStudy.StudyInstanceUid} SeriesInstanceUid:{newSeries.SeriesInstanceUid} SopInstanceUid: {instance.SopInstanceUid},newInstanceId:{newInstanceId} "); _ = _taskInstanceRepository.AddAsync(newInstance).Result; }