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(responseBody);