diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 5d9fb241c..d49f63206 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -2300,6 +2300,11 @@ 是否公共分页 + + + 是否获取预览 + + 序号标记 @@ -9022,14 +9027,11 @@ - + 获取表格问题及答案 只返回表格问题(任务和标准) - - - - + diff --git a/IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj b/IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj index 3b997b0fd..5cbdf014a 100644 --- a/IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj +++ b/IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj @@ -20,10 +20,6 @@ - - - - diff --git a/IRaCIS.Core.Domain/Management/User.cs b/IRaCIS.Core.Domain/Management/User.cs index dba284318..7d11c4094 100644 --- a/IRaCIS.Core.Domain/Management/User.cs +++ b/IRaCIS.Core.Domain/Management/User.cs @@ -16,7 +16,6 @@ namespace IRaCIS.Core.Domain.Models public List SystemDocConfirmedList { get; set; } public List UserDoctors { get; set; } = new List(); - public List UserRoleList { get; set; } = new List(); public List UserTrials { get; set; } = new List(); public List VisitTaskList { get; set; } diff --git a/IRaCIS.Core.Domain/Management/UserRole.cs b/IRaCIS.Core.Domain/Management/UserRole.cs deleted file mode 100644 index e76b40274..000000000 --- a/IRaCIS.Core.Domain/Management/UserRole.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models -{ - [Table("UserRole")] - public partial class UserRole : Entity - { - public Role Role { get; set; } - - public User User { get; set; } - public Guid UserId { get; set; } - public Guid RoleId { get; set; } - } -} diff --git a/IRaCIS.Core.Domain/SQLFile/Portal.sql b/IRaCIS.Core.Domain/SQLFile/Portal.sql new file mode 100644 index 000000000..5f282702b --- /dev/null +++ b/IRaCIS.Core.Domain/SQLFile/Portal.sql @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/IRaCIS.Core.Domain/SQLFile/Sql脚本.sql b/IRaCIS.Core.Domain/SQLFile/Test.sql similarity index 99% rename from IRaCIS.Core.Domain/SQLFile/Sql脚本.sql rename to IRaCIS.Core.Domain/SQLFile/Test.sql index 318355d8e..2e167bcd1 100644 --- a/IRaCIS.Core.Domain/SQLFile/Sql脚本.sql +++ b/IRaCIS.Core.Domain/SQLFile/Test.sql @@ -89,11 +89,13 @@ go update ReadingQuestionCriterionTrial set DigitPlaces=DigitPlaces-1 where DigitPlaces is not null - - update ReadingQuestionCriterionTrial set DigitPlaces=-1 where DigitPlaces=3 + + + + --Ƭ׼ά update DataInspection set ObjectRelationParentId3 = (select top 1 TrialReadingCriterionId from SubjectUser where Id =DataInspection.GeneralId) where EntityName='SubjectUser' update DataInspection set ObjectRelationParentId2 = (select top 1 TrialReadingCriterionId from ReadingPeriodSet where Id =DataInspection.GeneralId) where EntityName='ReadingPeriodSet' diff --git a/IRaCIS.Core.Domain/SQLFile/UAT.sql b/IRaCIS.Core.Domain/SQLFile/UAT.sql new file mode 100644 index 000000000..d56281d73 --- /dev/null +++ b/IRaCIS.Core.Domain/SQLFile/UAT.sql @@ -0,0 +1,35 @@ + +--无序维护sql +update VisitTask set TaskBlindName='Follow Up ' + from VisitTask +INNER join ReadingQuestionCriterionTrial on VisitTask.TrialReadingCriterionId=ReadingQuestionCriterionTrial.Id +INNER join SubjectVisit on VisitTask.SourceSubjectVisitId=SubjectVisit.Id + where SubjectVisit.IsBaseLine=0 and ReadingQuestionCriterionTrial.IsReadingTaskViewInOrder=0 + + +-- 有序维护sql +update VisitTask set TaskBlindName='Follow Up '+ cast(sv.rn as varchar) + from VisitTask +join ReadingQuestionCriterionTrial on VisitTask.TrialReadingCriterionId=ReadingQuestionCriterionTrial.Id +--join SubjectVisit on VisitTask.SourceSubjectVisitId=SubjectVisit.Id +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 xiuga +join SubjectVisit on VisitTask.SourceSubjectVisitId=SubjectVisit.Id where SubjectVisit.IsBaseLine=1 + +update Dictionary set code =0 where Id='15bb5529-a6fe-439f-5196-08da179a7080' +update Dictionary set code =1 where Id='0628d7be-afba-4471-5197-08da179a7080' +update Dictionary set code =2 where Id='41bfec4b-dbfb-401d-5198-08da179a7080' +update Dictionary set code =-1 where Id='1fac678d-69b6-41c3-5199-08da179a7080' +go + + +update ReadingQuestionCriterionTrial set DigitPlaces=DigitPlaces-1 where DigitPlaces is not null +update ReadingQuestionCriterionTrial set DigitPlaces=-1 where DigitPlaces=3 + + +--2022 12 -9 同步 +-- Dictionary UserTypeMenu Menu FrontAuditConfig ReadingQuestionCriterionSystem ReadingTableQuestionSystem + + diff --git a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs index dc73944fd..6ac0a430d 100644 --- a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs +++ b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs @@ -297,7 +297,6 @@ namespace IRaCIS.Core.Infra.EFCore public virtual DbSet Roles { get; set; } public virtual DbSet UserTypeMenuFunction { get; set; } public virtual DbSet Users { get; set; } - public virtual DbSet UserRoles { get; set; } public virtual DbSet TrialAudit { get; set; } public virtual DbSet UserType { get; set; }