From 317184ba7a5e725657ed9d7778f17a01802b84b1 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 4 Nov 2024 10:14:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.API/appsettings.json                          | 8 ++++++++
 .../Service/ImageAndDoc/DownloadAndUploadService.cs       | 2 +-
 .../Service/MinimalApiService/OAuthService.cs             | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.API/appsettings.json b/IRaCIS.Core.API/appsettings.json
index 529451e7f..c575d4113 100644
--- a/IRaCIS.Core.API/appsettings.json
+++ b/IRaCIS.Core.API/appsettings.json
@@ -66,5 +66,13 @@
     "ApiPathList": [
       "/test/get"
     ]
+  },
+  "oauth": {
+    "github": {
+      "app_id": "github_app_id",
+      "app_key": "github_app_key",
+      "redirect_uri": "https://oauthlogin.net/oauth/githubcallback",
+      "scope": "repo"
+    }
   }
 }
\ No newline at end of file
diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
index f3555d542..eca846b30 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
@@ -325,7 +325,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                     if (findStudy.SubejectCode == inCommand.SubjectCode && findStudy.SubjectId == inCommand.SubjectId)
                     {
                         //上传给后处理其他访视了
-                        if (inCommand.VisitTaskId != null && findStudy.VisitTaskId != null && findStudy.VisitTaskId != inCommand.VisitTaskId)
+                        if (inCommand.VisitTaskId != null && findStudy.VisitTaskId != null && findStudy.VisitTaskId != inCommand.VisitTaskId && findStudy.SubjectVisitId != currentUploadSubjectVisitId)
                         {
                             result.Add(new TaskStudyArchiveConfirmResult() { StudyInstanceUid = studyUid, IsAllowReUpload = false, IsAllowUpload = false });
                         }
diff --git a/IRaCIS.Core.Application/Service/MinimalApiService/OAuthService.cs b/IRaCIS.Core.Application/Service/MinimalApiService/OAuthService.cs
index 921983ae9..c1f9c05e1 100644
--- a/IRaCIS.Core.Application/Service/MinimalApiService/OAuthService.cs
+++ b/IRaCIS.Core.Application/Service/MinimalApiService/OAuthService.cs
@@ -185,8 +185,8 @@ namespace IRaCIS.Core.Application.Service
 
                 // 格式化并输出 JSON
                 var formattedJson = jsonObject.ToString(Formatting.Indented);
-                Console.WriteLine(formattedJson);
 
+                Console.WriteLine(formattedJson);
 
                 var tokenResponse=JsonConvert.DeserializeObject<LogtoTokenResponse>(responseBody);