问卷

src/Shentun.WebPeis.Domain/Models/Question.cs

@@ -35,10 +35,10 @@ public partial class Question : AuditedEntity, IHasConcurrencyStamp
 
     public char? AnswerType { get; set; }
     /// <summary>
-    /// 问卷性质ID
+    /// 问卷题目类别
     /// </summary>
 
-    public string QuestionNatureId { get; set; }
+    public string QuestionSubjectTypeId { get; set; }
     /// <summary>
     /// 启用
     /// </summary>

src/Shentun.WebPeis.Domain/Models/QuestionAnswer.cs

@@ -50,8 +50,14 @@ public partial class QuestionAnswer : AuditedEntity, IHasConcurrencyStamp
     /// </summary>
 
     public string? PathCode { get; set; }
-
+    /// <summary>
+    /// 子答案标题
+    /// </summary>
     public string? ChildAnswerTitle { get; set; }
+    /// <summary>
+    /// 无，和其它答案排斥
+    /// </summary>
+    public char IsNone { get; set; }
     public virtual ICollection<QuestionRegisterAnswer> QuestionRegisterAnswers { get; set; } = new List<QuestionRegisterAnswer>();
     public string? ConcurrencyStamp { get; set; }
 

src/Shentun.WebPeis.Domain/Models/QuestionNature.cs → src/Shentun.WebPeis.Domain/Models/QuestionSubjectType.cs

@@ -8,17 +8,17 @@ using Volo.Abp.Domain.Entities;
 
 namespace Shentun.WebPeis.Models
 {
-    public class QuestionNature : AuditedEntity, IHasConcurrencyStamp
+    public class QuestionSubjectType : AuditedEntity, IHasConcurrencyStamp
     {
         /// <summary>
         /// 主键
         /// </summary>
-        public string QuestionNatureId { get; set; }
+        public string QuestionSubjectTypeId { get; set; }
         /// <summary>
         /// 名称
         /// </summary>
 
-        public string QuestionNatureName { get; set; } = null!;
+        public string QuestionSubjectTypeName { get; set; } = null!;
 
         public string SimpleCode { get; set; } = null!;
 
@@ -30,7 +30,7 @@ namespace Shentun.WebPeis.Models
 
         public override object?[] GetKeys()
         {
-            return [QuestionNatureId];
+            return [QuestionSubjectTypeId];
         }
     }
 }

src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionAnswerConfigure.cs

@@ -59,6 +59,11 @@ namespace Shentun.WebPeis.Configures
             entity.Property(e => e.PathCode)
                 .HasMaxLength(60)
                 .HasColumnName("path_code");
+
+            entity.Property(e => e.IsNone)
+               .HasMaxLength(1)
+               .HasColumnName("is_none");
+
         }
     }
 }

src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionConfigure.cs

@@ -27,9 +27,9 @@ namespace Shentun.WebPeis.Configures
                 .HasMaxLength(60)
                 .HasColumnName("path_code");
 
-            entity.Property(e => e.QuestionNatureId)
+            entity.Property(e => e.QuestionSubjectTypeId)
                .HasMaxLength(2)
-               .HasColumnName("question_nature_id");
+               .HasColumnName("question_subject_type_id");
 
             entity.Property(e => e.AnswerType)
                 .HasMaxLength(1)

src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionNatureConfigure.cs → src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionSubjectTypeConfigure.cs

@@ -10,24 +10,24 @@ using Volo.Abp.Domain.Entities;
 
 namespace Shentun.WebPeis.Configures
 {
-    public class QuestionNatureConfigure : IEntityTypeConfiguration<QuestionNature>
+    public class QuestionSubjectTypeConfigure : IEntityTypeConfiguration<QuestionSubjectType>
     {
-        public void Configure(EntityTypeBuilder<QuestionNature> entity)
+        public void Configure(EntityTypeBuilder<QuestionSubjectType> entity)
         {
-            entity.HasKey(e => e.QuestionNatureId).HasName("pk_question_nature");
+            entity.HasKey(e => e.QuestionSubjectTypeId).HasName("pk_question_subject_type");
 
-            entity.ToTable("question_nature");
+            entity.ToTable("question_subject_type");
 
-            entity.HasIndex(e => e.QuestionNatureName, "ix_question_nature").IsUnique();
+            entity.HasIndex(e => e.QuestionSubjectTypeName, "ix_question_subject_type").IsUnique();
 
-            entity.Property(e => e.QuestionNatureId)
+            entity.Property(e => e.QuestionSubjectTypeId)
                 .HasMaxLength(2)
-                .HasColumnName("question_nature_id");
+                .HasColumnName("question_subject_type_id");
             entity.Property(e => e.CreationTime)
                 .HasColumnType("timestamp(6) without time zone")
                 .HasColumnName("creation_time");
             entity.Property(e => e.CreatorId).HasColumnName("creator_id");
-            entity.Property(e => e.QuestionNatureName)
+            entity.Property(e => e.QuestionSubjectTypeName)
                 .HasMaxLength(20)
                 .HasColumnName("disease_risk_name");
             entity.Property(e => e.DisplayOrder)

src/Shentun.WebPeis.EntityFrameworkCore/EntityFrameworkCore/WebPeisDbContext.cs

@@ -181,7 +181,7 @@ public partial class WebPeisDbContext : AbpDbContext<WebPeisDbContext>,
 
     public virtual DbSet<PersonKinship> PersonKinships { get; set; }
 
-    public virtual DbSet<QuestionNature> QuestionNatures { get; set; }
+    public virtual DbSet<QuestionSubjectType> QuestionNatures { get; set; }
     public virtual DbSet<Question> Questions { get; set; }
 
     public virtual DbSet<QuestionAnswer> QuestionAnswers { get; set; }