From 9380b40c28ff6cf0dd446f0866a93c83f2f666cb Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 14 Sep 2023 10:37:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BF=E8=A7=86?= =?UTF-8?q?=E5=9F=BA=E5=87=86=E6=97=A5=E6=9C=9F=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.API/Properties/launchSettings.json | 2 +- .../Service/TrialSiteUser/DTO/TrialConfigDTO.cs | 2 ++ .../Service/Visit/DTO/ClinicalStudySubjects.cs | 2 ++ IRaCIS.Core.Domain/Trial/Trial.cs | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.API/Properties/launchSettings.json b/IRaCIS.Core.API/Properties/launchSettings.json index 6736bd9b9..17680827f 100644 --- a/IRaCIS.Core.API/Properties/launchSettings.json +++ b/IRaCIS.Core.API/Properties/launchSettings.json @@ -21,7 +21,7 @@ "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Test_Study" }, - "applicationUrl": "http://localhost:6100" + "applicationUrl": "http://localhost:6000" } } } \ No newline at end of file diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs index 52d5a5894..cebb72bfa 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs @@ -67,6 +67,8 @@ namespace IRaCIS.Core.Application.Contracts public string Modalitys { get; set; } = string.Empty; + public string VisitBaseDataDes { get; set; } + public List ModalityList { get; set; } = new List(); diff --git a/IRaCIS.Core.Application/Service/Visit/DTO/ClinicalStudySubjects.cs b/IRaCIS.Core.Application/Service/Visit/DTO/ClinicalStudySubjects.cs index 242c45f81..7613c04c2 100644 --- a/IRaCIS.Core.Application/Service/Visit/DTO/ClinicalStudySubjects.cs +++ b/IRaCIS.Core.Application/Service/Visit/DTO/ClinicalStudySubjects.cs @@ -77,6 +77,8 @@ namespace IRaCIS.Application.Contracts public bool IsPDProgressView { get; set; } + public string VisitBaseDataDes { get; set; } + public bool IsSubjectSecondCodeView { get; set; } = false; } diff --git a/IRaCIS.Core.Domain/Trial/Trial.cs b/IRaCIS.Core.Domain/Trial/Trial.cs index c40b80e07..13a92fa54 100644 --- a/IRaCIS.Core.Domain/Trial/Trial.cs +++ b/IRaCIS.Core.Domain/Trial/Trial.cs @@ -299,7 +299,7 @@ namespace IRaCIS.Core.Domain.Models public int PlanVisitCount { get; set; } - + public string VisitBaseDataDes { get; set; } = string.Empty; public DateTime? TrialFinishedTime { get; set; } From ac62f48a71906e1428552119f0bc930e665e81bf Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 14 Sep 2023 11:44:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=99=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Domain/Trial/Trial.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/IRaCIS.Core.Domain/Trial/Trial.cs b/IRaCIS.Core.Domain/Trial/Trial.cs index 13a92fa54..54cb8ba39 100644 --- a/IRaCIS.Core.Domain/Trial/Trial.cs +++ b/IRaCIS.Core.Domain/Trial/Trial.cs @@ -299,7 +299,8 @@ namespace IRaCIS.Core.Domain.Models public int PlanVisitCount { get; set; } - public string VisitBaseDataDes { get; set; } = string.Empty; + public string VisitBaseDataDes { get; set; } = StaticData.International("Trial_VisitBaseDataDes"); + public DateTime? TrialFinishedTime { get; set; }