From 33cfacec841ed98ce6ae89db8438ca4bb867e473 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 16 Aug 2024 16:17:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- irc_api.drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/irc_api.drone.yml b/irc_api.drone.yml index 290fa2b13..a6e09d6e3 100644 --- a/irc_api.drone.yml +++ b/irc_api.drone.yml @@ -19,7 +19,7 @@ steps: - name: build-uat-irc commands: - cd /opt/1panel/xc-deploy/Uat_IRC/devops-build-publish/Uat-To-Uat - - sh pull-build-uat-irc-image.sh v${DRONE_BUILD_NUMBER} + - sh uat-branch-latest-build-image-publish.sh v${DRONE_BUILD_NUMBER} trigger: branch: From c757212c072f6672d8704a82db53947378cc0ca6 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 16 Aug 2024 17:30:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.API/appsettings.Uat_IRC.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.API/appsettings.Uat_IRC.json b/IRaCIS.Core.API/appsettings.Uat_IRC.json index 8176d5f8a..18d24b8ce 100644 --- a/IRaCIS.Core.API/appsettings.Uat_IRC.json +++ b/IRaCIS.Core.API/appsettings.Uat_IRC.json @@ -12,7 +12,7 @@ }, "ObjectStoreService": { - "ObjectStoreUse": "MinIO", + "ObjectStoreUse": "AliyunOSS", "AliyunOSS": { "regionId": "cn-shanghai", From ec9e35180b765dd5b456f4b977b0a3868de4fbf7 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 19 Aug 2024 14:02:53 +0800 Subject: [PATCH 3/3] =?UTF-8?q?crc=20=E4=B8=8A=E4=BC=A0=E6=8E=A7=E5=88=B6p?= =?UTF-8?q?acs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs | 2 ++ IRaCIS.Core.Application/Service/QC/QCListService.cs | 1 + 2 files changed, 3 insertions(+) diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs index d5981a4a3..c06c05c5f 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs @@ -157,6 +157,8 @@ namespace IRaCIS.Core.Application.Contracts public bool IsHaveVisitClinicalData { get; set; } = false; + public bool IsPacsConnectConfiged { get; set; } + } diff --git a/IRaCIS.Core.Application/Service/QC/QCListService.cs b/IRaCIS.Core.Application/Service/QC/QCListService.cs index 657675744..a44086439 100644 --- a/IRaCIS.Core.Application/Service/QC/QCListService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCListService.cs @@ -547,6 +547,7 @@ namespace IRaCIS.Core.Application.Image.QA config.IsHaveStudyClinicalData = await _clinicalDataTrialSetRepository.AnyAsync(x => x.IsConfirm && x.TrialId == visit.TrialId && x.ClinicalDataLevel == ClinicalLevel.Study); + config.IsPacsConnectConfiged= await _subjectVisitRepository.Where(t=>t.Id==subjectVisitId).AnyAsync(t=>t.Trial.IsPACSConnect && t.Subject.TrialSite.TrialSiteDicomAEList.Any()); return (list, config); }