diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs index 38967d77..a0ccde42 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs @@ -31,26 +31,26 @@ namespace IRaCIS.Core.Domain.Models /// /// Type /// - public string Type { get; set; } - + public string Type { get; set; } = string.Empty; + /// - /// ParentId - /// + /// ParentId + /// public Guid? ParentId { get; set; } /// /// ParentTriggerValue /// - public string ParentTriggerValue { get; set; } - + public string ParentTriggerValue { get; set; } = string.Empty; + /// - /// QuestionName - /// - public string QuestionName { get; set; } - + /// QuestionName + /// + public string QuestionName { get; set; } = string.Empty; + /// - /// IsRequired - /// + /// IsRequired + /// public IsRequired IsRequired { get; set; } /// @@ -61,11 +61,11 @@ namespace IRaCIS.Core.Domain.Models /// /// TypeValue /// - public string TypeValue { get; set; } - + public string TypeValue { get; set; } = string.Empty; + /// - /// IsEnable - /// + /// IsEnable + /// public bool IsEnable { get; set; } /// @@ -81,21 +81,21 @@ namespace IRaCIS.Core.Domain.Models /// /// Remark /// - public string Remark { get; set; } - + public string Remark { get; set; } = string.Empty; + /// - /// RelevanceId - /// + /// RelevanceId + /// public Guid? RelevanceId { get; set; } /// /// RelevanceValue /// - public string RelevanceValue { get; set; } - + public string RelevanceValue { get; set; } = string.Empty; + /// - /// ShowQuestion - /// + /// ShowQuestion + /// public int ShowQuestion { get; set; } /// @@ -106,11 +106,11 @@ namespace IRaCIS.Core.Domain.Models /// /// DataTableName /// - public string DataTableName { get; set; } - + public string DataTableName { get; set; } = string.Empty; + /// - /// DataTableColumn - /// + /// DataTableColumn + /// public string DataTableColumn { get; set; } /// @@ -143,7 +143,7 @@ namespace IRaCIS.Core.Domain.Models /// /// 字典code /// - public string DictionaryCode { get; set; } + public string DictionaryCode { get; set; } = string.Empty; /// /// 数值类型 diff --git a/IRaCIS.Core.Domain/SQLFile/Sql脚本.sql b/IRaCIS.Core.Domain/SQLFile/Sql脚本.sql index 48f3099b..1df98ac2 100644 --- a/IRaCIS.Core.Domain/SQLFile/Sql脚本.sql +++ b/IRaCIS.Core.Domain/SQLFile/Sql脚本.sql @@ -74,7 +74,7 @@ join ReadingQuestionCriterionTrial on VisitTask.TrialReadingCriterionId=ReadingQ join ( select Id SubjectVisitId, IsBaseLine, ROW_NUMBER() over( partition by SubjectId order by VisitNum asc )-1 rn,VisitNum from SubjectVisit) sv on VisitTask.SourceSubjectVisitId=sv.SubjectVisitId where sv.IsBaseLine=0 and ReadingQuestionCriterionTrial.IsReadingTaskViewInOrder=1 -update VisitTask set TaskBlindName='Baseline' from VisitTask +update VisitTask set TaskBlindName='Baseline' from VisitTask xiuga join SubjectVisit on VisitTask.SourceSubjectVisitId=SubjectVisit.Id where SubjectVisit.IsBaseLine=1 @@ -100,3 +100,5 @@ update DataInspection set ObjectRelationParentId2 = (select top 1 TrialReadingC update DataInspection set ObjectRelationParentId2 = (select top 1 TrialReadingCriterionId from ReadModule where Id =DataInspection.GeneralId) where EntityName='ReadModule' update DataInspection set ObjectRelationParentId2 = (select top 1 TrialReadingCriterionId from TaskConsistentRule where Id =DataInspection.GeneralId) where EntityName='TaskConsistentRule' update DataInspection set ObjectRelationParentId3 = (select top 1 TrialReadingCriterionId from VisitTask where Id =DataInspection.GeneralId) where EntityName='VisitTask' + +update ReadingTableQuestionTrial set DictionaryCode='' where DictionaryCode is null