diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialViewModel.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialViewModel.cs index 3c2ccfcc2..4db9d45a7 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialViewModel.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialViewModel.cs @@ -52,13 +52,11 @@ namespace IRaCIS.Application.Contracts public Guid? PhaseId { get; set; } - public string DeclarationTypeOther { get; set; } public List DeclarationTypeEnumList { get; set; } public List AttendedReviewerTypeEnumList { get; set; } - public string DeclarationTypes { get; set; } - public string AttendedReviewerTypes { get; set; } - public string AttendedReviewerTypeOther { get; set; } + public string DeclarationTypes { get; set; }=string.Empty; + public string AttendedReviewerTypes { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs index 1604fa680..ec584d892 100644 --- a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs +++ b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs @@ -56,7 +56,7 @@ namespace IRaCIS.Core.Domain.Models /// /// 标识 /// - public string Identification { get; set; } + public string Identification { get; set; } = string.Empty; public Guid? ParentId { get; set; } diff --git a/IRaCIS.Core.Domain/SQLFile/20230606号.sql b/IRaCIS.Core.Domain/SQLFile/20230606号.sql index 603aa7f8d..cefb74b31 100644 --- a/IRaCIS.Core.Domain/SQLFile/20230606号.sql +++ b/IRaCIS.Core.Domain/SQLFile/20230606号.sql @@ -1,14 +1,9 @@  --新增字段 -ALTER TABLE [dbo].[Trial] ADD [AttendedReviewerTypeOther] varchar(255) COLLATE Chinese_PRC_CI_AS DEFAULT '' NOT NULL -GO ALTER TABLE [dbo].[Trial] ADD [AttendedReviewerTypes] varchar(255) COLLATE Chinese_PRC_CI_AS DEFAULT '' NOT NULL GO -ALTER TABLE [dbo].[Trial] ADD [DeclarationTypeOther] varchar(255) COLLATE Chinese_PRC_CI_AS DEFAULT '' NOT NULL -GO - ALTER TABLE [dbo].[Trial] ADD [DeclarationTypes] varchar(255) COLLATE Chinese_PRC_CI_AS DEFAULT '' NOT NULL GO @@ -19,7 +14,6 @@ UPDATE Trial SET AttendedReviewerTypes = '|' + CAST(AttendedReviewerType AS VARC update Trial set DeclarationTypes ='|' + (select Code from Dictionary where Id= Trial.DeclarationTypeId) + '|' - --验证sql select DISTINCT AttendedReviewerType ,AttendedReviewerTypes, DeclarationTypeId, Dictionary.Code,DeclarationTypes,Dictionary.[Value] from Trial inner join Dictionary on Trial.DeclarationTypeId=Dictionary.Id diff --git a/IRaCIS.Core.Domain/Trial/Trial.cs b/IRaCIS.Core.Domain/Trial/Trial.cs index 41456b09b..9c5529c8c 100644 --- a/IRaCIS.Core.Domain/Trial/Trial.cs +++ b/IRaCIS.Core.Domain/Trial/Trial.cs @@ -152,7 +152,7 @@ namespace IRaCIS.Core.Domain.Models //public Guid DeclarationTypeId { get; set; } = Guid.Empty; - public string DeclarationTypeOther { get; set; } + public string DeclarationTypes { get; set; } [NotMapped] @@ -164,7 +164,7 @@ namespace IRaCIS.Core.Domain.Models .Select(s => Enum.Parse(typeof(AttendedReviewerType), s)).Cast().ToList(); public string AttendedReviewerTypes { get; set; } - public string AttendedReviewerTypeOther { get; set; } +