From f828a7d1e28aa04e37417720cd979897e1d51a73 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 4 May 2023 15:37:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs         | 6 +-----
 .../Service/ImageAndDoc/StudyService.cs                    | 7 ++-----
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
index 9c9ca883b..3dd2e1d52 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
@@ -217,12 +217,9 @@ namespace IRaCIS.Core.Application.Contracts
     public class AddOrUpdateStudyDto
     {
 
-        public Guid? Id { get; set; }
 
         public string StudyId { get; set; } = string.Empty;
-
-       
-
+      
         //public int Code { get; set; } = 0;
 
         //public string StudyCode { get; set; } = string.Empty;
@@ -257,7 +254,6 @@ namespace IRaCIS.Core.Application.Contracts
 
     public class AddOrUpdateSeriesDto
     {
-        public Guid? Id { get; set; }
         public string StudyInstanceUid { get; set; }
         public string SeriesInstanceUid { get; set; }
         public int SeriesNumber { get; set; }
diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs
index ac3691d2e..db6cb1b7e 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs
@@ -205,7 +205,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
             else
             {
 
-                var studyId = incommand.Study.Id;
+                var studyId = IdentifierHelper.CreateGuid(incommand.Study.StudyInstanceUid, incommand.TrialId.ToString());;
 
                 var study = await _dicomstudyRepository.FirstOrDefaultAsync(t => t.Id == studyId);
 
@@ -214,7 +214,6 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                 //特殊处理逻辑
                 SpecialArchiveStudyDeal(study);
 
-                //await _dicomSeriesRepository.BatchDeleteNoTrackingAsync(t => t.StudyId == incommand.Study.Id);
 
 
                 // 少了整个序列
@@ -245,9 +244,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                         dicomSeries= await _dicomSeriesRepository.AddAsync(series);
 
                         //新的序列 那么  检查的序列数量+1
-                        study.SeriesCount += 1;
-
-                        
+                        study.SeriesCount += 1;                     
                     }
                     else
                     {