问卷

src/Shentun.WebPeis.Application/QuestionRegisters/QuestionRegisterAppService.cs

@@ -15,13 +15,21 @@ namespace Shentun.WebPeis.QuestionRegisters
     {
         private readonly IRepository<QuestionRegister> _repository;
         private readonly IRepository<QuestionRegisterItem> _questionRegisterItemRepository;
-        //private readonly IRepository<QuestionRegister> _repository;
-        //private readonly IRepository<QuestionRegister> _repository;
-        //private readonly IRepository<QuestionRegister> _repository;
+        private readonly IRepository<QuestionRegisterAnswer> _questionRegisterAnswerRrepository;
+        private readonly IRepository<Question> _questionRepository;
+        private readonly IRepository<QuestionAnswer> _questionAnswerRepository;
 
-        public QuestionRegisterAppService(IRepository<QuestionRegister> repository)
+        public QuestionRegisterAppService(IRepository<QuestionRegister> repository, 
+            IRepository<QuestionRegisterItem> questionRegisterItemRepository,
+            IRepository<QuestionRegisterAnswer> questionRegisterAnswerRrepository,
+            IRepository<Question> questionRepository,
+            IRepository<QuestionAnswer> questionAnswerRepository)
         {
             _repository = repository;
+            _questionRegisterItemRepository = questionRegisterItemRepository;
+            _questionRegisterAnswerRrepository = questionRegisterAnswerRrepository;
+            _questionRepository = questionRepository;
+            _questionAnswerRepository = questionAnswerRepository;
         }
 
         public async Task GetByPersonId(PersonIdInputDto input)

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

@@ -45,6 +45,8 @@ public partial class DiseaseRiskLevel : AuditedEntity, IHasConcurrencyStamp
 
     public string? Suggestion { get; set; }
 
+    public string DiagnosisFunction {  get; set; }
+
     public virtual DiseaseRisk DiseaseRisk { get; set; } = null!;
 
     public string? ConcurrencyStamp { get; set; }
@@ -52,6 +54,7 @@ public partial class DiseaseRiskLevel : AuditedEntity, IHasConcurrencyStamp
     /// 疾病风险推荐的组合项目
     /// </summary>
 
+
     public virtual ICollection<DiseaseRiskLevelAsbitem> DiseaseRiskLevelAsbitems { get; set; } = new List<DiseaseRiskLevelAsbitem>();
 
     public override object?[] GetKeys()

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

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

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

@@ -39,11 +39,6 @@ public partial class QuestionAnswer : AuditedEntity, IHasConcurrencyStamp
     /// </summary>
 
     public char? AnswerResultType { get; set; }
-    /// <summary>
-    /// 答案对应的疾病风险级别ID
-    /// </summary>
-
-    public Guid? DiseaseRiskLevelId { get; set; }
 
     /// <summary>
     /// 父答案ID

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

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.Domain.Entities.Auditing;
+using Volo.Abp.Domain.Entities;
+
+namespace Shentun.WebPeis.Models
+{
+    public class QuestionNature : AuditedEntity, IHasConcurrencyStamp
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public string QuestionNatureId { get; set; }
+        /// <summary>
+        /// 名称
+        /// </summary>
+
+        public string QuestionNatureName { get; set; } = null!;
+
+        public string SimpleCode { get; set; } = null!;
+
+        public int DisplayOrder { get; set; }
+
+
+
+        public string? ConcurrencyStamp { get; set; }
+
+        public override object?[] GetKeys()
+        {
+            return [QuestionNatureId];
+        }
+    }
+}

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

@@ -49,6 +49,9 @@ namespace Shentun.WebPeis.Configures
                 .HasMaxLength(255)
                 .HasColumnName("suggestion");
 
+            entity.Property(e => e.DiagnosisFunction)
+               .HasColumnName("diagnosis_function");
+
             entity.HasOne(d => d.DiseaseRisk).WithMany(p => p.DiseaseRiskLevels)
                 .HasForeignKey(d => d.DiseaseRiskId)
                 .OnDelete(DeleteBehavior.ClientSetNull)

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

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

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

@@ -0,0 +1,49 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using Shentun.WebPeis.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.Domain.Entities;
+
+namespace Shentun.WebPeis.Configures
+{
+    public class QuestionNatureConfigure : IEntityTypeConfiguration<QuestionNature>
+    {
+        public void Configure(EntityTypeBuilder<QuestionNature> entity)
+        {
+            entity.HasKey(e => e.QuestionNatureId).HasName("pk_question_nature");
+
+            entity.ToTable("question_nature");
+
+            entity.HasIndex(e => e.QuestionNatureName, "ix_question_nature").IsUnique();
+
+            entity.Property(e => e.QuestionNatureId)
+                .HasMaxLength(2)
+                .HasColumnName("question_nature_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)
+                .HasMaxLength(20)
+                .HasColumnName("disease_risk_name");
+            entity.Property(e => e.DisplayOrder)
+                .HasDefaultValue(999999)
+                .HasColumnName("display_order");
+            entity.Property(e => e.LastModificationTime)
+                .HasColumnType("timestamp(6) without time zone")
+                .HasColumnName("last_modification_time");
+            entity.Property(e => e.LastModifierId).HasColumnName("last_modifier_id");
+            entity.Property(e => e.SimpleCode)
+                .HasMaxLength(20)
+                .HasColumnName("simple_code");
+
+            entity.Property(e => e.ConcurrencyStamp)
+                .HasMaxLength(40)
+                .HasColumnName("concurrency_stamp");
+        }
+    }
+}

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

@@ -181,6 +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<Question> Questions { get; set; }
 
     public virtual DbSet<QuestionAnswer> QuestionAnswers { get; set; }