From 068b3fa8d7b89636e56fc4b048dc9b7bd63ef571 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 14 Nov 2024 15:57:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9HIR=20=E8=8E=B7=E5=8F=96?=
=?UTF-8?q?=E6=A3=80=E6=9F=A5=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Service/Visit/PatientService.cs | 2 +-
irc_api.drone.yml | 185 ++++--------------
2 files changed, 39 insertions(+), 148 deletions(-)
diff --git a/IRaCIS.Core.Application/Service/Visit/PatientService.cs b/IRaCIS.Core.Application/Service/Visit/PatientService.cs
index 37a60c997..7ec29050b 100644
--- a/IRaCIS.Core.Application/Service/Visit/PatientService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/PatientService.cs
@@ -2757,7 +2757,6 @@ namespace IRaCIS.Application.Services
TrialId = sv.TrialId,
SubjectId = sv.SubjectId,
SubjectCode = sv.Subject.Code,
- TrialSiteCode = sv.TrialSite.TrialSiteCode,
VisitName = sv.VisitName,
StudyList = sv.StudyList
@@ -2806,6 +2805,7 @@ namespace IRaCIS.Application.Services
///
///
///
+ [HttpGet]
public async Task DownloadImageSuccess(Guid trialImageDownloadId)
{
await _subejctVisitDownloadRepository.UpdatePartialFromQueryAsync(t => t.Id == trialImageDownloadId, u => new SubejctVisitDownload()
diff --git a/irc_api.drone.yml b/irc_api.drone.yml
index 5fcacf26d..7719ab3d2 100644
--- a/irc_api.drone.yml
+++ b/irc_api.drone.yml
@@ -1,144 +1,4 @@
-kind: pipeline
-type: ssh
-name: ssh-linux-uat-irc-build-image
-platform:
- os: Linux
- arch: 386
-
-clone:
- disable: true
-
-server:
- host: 47.117.164.182
- user: root
- password:
- from_secret: test_ssh_pwd
-
-steps:
-- name: build-uat-irc
- commands:
- - cd /opt/1panel/xc-deploy/Uat_IRC/devops-build-publish/Uat-To-Uat
- - sh uat-branch-latest-build-image-publish.sh v${DRONE_BUILD_NUMBER}
-
-trigger:
- branch:
- - Uat_IRC_Net8
-
----
-kind: pipeline
-type: ssh
-name: ssh-linux-test-irc-publish
-
-platform:
- os: Linux
- arch: 386
-
-clone:
- disable: true
-
-server:
- host: 106.14.89.110
- user: root
- password:
- from_secret: test_ssh_pwd
-
-steps:
-- name: publish-test-irc
- commands:
- - cd /opt/1panel/xc-deploy/Test_IRC/devops-build-publish;sh test-irc-update-or-create-stack.sh v${DRONE_BUILD_NUMBER}
-
-trigger:
- branch:
- - Test_IRC_Net8
-
----
-kind: pipeline
-type: ssh
-name: ssh-linux-test-irc-scp-publish
-
-platform:
- os: Linux
- arch: 386
-
-clone:
- disable: true
-
-server:
- host: 106.14.89.110
- user: root
- password:
- from_secret: test_ssh_pwd
-
-steps:
-- name: publish-test-irc-scp
- commands:
- - cd /opt/1panel/xc-deploy/Test_IRC_SCP/devops-build-publish;sh pull-build-test-irc-scp-image.sh v${DRONE_BUILD_NUMBER}
- - cd /opt/1panel/xc-deploy/Test_IRC_SCP ;sh update-image-if-need-then-pull-aliyun.sh v${DRONE_BUILD_NUMBER}
-
-trigger:
- branch:
- - Test_IRC_Net8—_SCP_Disable
-
----
-kind: pipeline
-type: ssh
-name: ssh-linux-test-study-publish
-
-platform:
- os: Linux
- arch: 386
-
-clone:
- disable: true #禁用默认克隆
-
-server:
- host: 106.14.89.110
- user: root
- password:
- from_secret: test_ssh_pwd
-
-steps:
-- name: publish-test-study
- commands:
- - cd /opt/1panel/xc-deploy/Test_Study/devops-build-publish ; sh pull-build-test-study-image.sh v${DRONE_BUILD_NUMBER}
- - cd /opt/1panel/xc-deploy/Test_Study ;sh update-image-if-need-then-pull-aliyun.sh v${DRONE_BUILD_NUMBER}
-
-trigger:
- branch:
- - Test_Study_Net8
-
----
-kind: pipeline
-type: ssh
-name: ssh-linux-test-scp-publish
-
-platform:
- os: Linux
- arch: 386
-
-clone:
- disable: true #禁用默认克隆
-
-server:
- host: 106.14.89.110
- user: root
- password:
- from_secret: test_ssh_pwd
-
-steps:
-- name: publish-test-hir-scp
- commands:
- - cd /opt/1panel/xc-deploy/Test_HIR_SCP/devops-build-publish;sh pull-build-test-hir-scp-image.sh v${DRONE_BUILD_NUMBER}
- - cd /opt/1panel/xc-deploy/Test_HIR_SCP ;sh update-image-if-need-then-pull-aliyun.sh v${DRONE_BUILD_NUMBER}
-trigger:
- branch:
- - Test_HIR
-
-
----
-
-
kind: pipeline
type: ssh
name: ssh-linux-test-hir-publish
@@ -146,23 +6,54 @@ name: ssh-linux-test-hir-publish
platform:
os: Linux
arch: 386
-
-clone:
- disable: true #禁用默认克隆
+clone:
+ disable: true
+
server:
host: 106.14.89.110
user: root
password:
from_secret: test_ssh_pwd
-
+
steps:
- name: publish-test-hir
commands:
- - cd /opt/1panel/xc-deploy/Test_HIR/devops-build-publish;sh pull-build-test-hir-image.sh v${DRONE_BUILD_NUMBER}
- - cd /opt/1panel/xc-deploy/Test_HIR ; sh update-image-if-need-then-pull-aliyun.sh v${DRONE_BUILD_NUMBER}
+ - cd /opt/1panel/xc-deploy/Test_HIR_New/devops-build-publish;sh test_hir_net8.sh.sh
+
trigger:
branch:
- - Test_HIR
+ - Test_HIR_Net8
+---
+kind: pipeline
+type: ssh
+name: ssh-linux-test-hir-scp-publish
+
+platform:
+ os: Linux
+ arch: 386
+
+clone:
+ disable: true
+
+server:
+ host: 106.14.89.110
+ user: root
+ password:
+ from_secret: test_ssh_pwd
+
+steps:
+- name: publish-test-hir-scp
+ commands:
+ - cd /opt/1panel/xc-deploy/Test_HIR_SCP_New/devops-build-publish;sh test_hir_scp_net8.sh
+
+trigger:
+ branch:
+ - Test_IRC_Net8—_SCP_Disable
+
+
+
+
+
\ No newline at end of file