From 2524ff37e4fd8f7f23a9b08ab589960bc8b41611 Mon Sep 17 00:00:00 2001 From: "DESKTOP-G961P6V\\Zhh" <839860190@qq.com> Date: Thu, 13 Jun 2024 22:28:58 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E5=8D=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QuestionRegisterAppService.cs | 16 ++++-- .../Models/DiseaseRiskLevel.cs | 3 ++ src/Shentun.WebPeis.Domain/Models/Question.cs | 5 ++ .../Models/QuestionAnswer.cs | 5 -- .../Models/QuestionNature.cs | 36 ++++++++++++++ .../Configures/DiseaseRiskLevelConfigure.cs | 3 ++ .../Configures/QuestionConfigure.cs | 4 ++ .../Configures/QuestionNatureConfigure.cs | 49 +++++++++++++++++++ .../EntityFrameworkCore/WebPeisDbContext.cs | 1 + 9 files changed, 113 insertions(+), 9 deletions(-) create mode 100644 src/Shentun.WebPeis.Domain/Models/QuestionNature.cs create mode 100644 src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionNatureConfigure.cs diff --git a/src/Shentun.WebPeis.Application/QuestionRegisters/QuestionRegisterAppService.cs b/src/Shentun.WebPeis.Application/QuestionRegisters/QuestionRegisterAppService.cs index 8df5a56..324623f 100644 --- a/src/Shentun.WebPeis.Application/QuestionRegisters/QuestionRegisterAppService.cs +++ b/src/Shentun.WebPeis.Application/QuestionRegisters/QuestionRegisterAppService.cs @@ -15,13 +15,21 @@ namespace Shentun.WebPeis.QuestionRegisters { private readonly IRepository _repository; private readonly IRepository _questionRegisterItemRepository; - //private readonly IRepository _repository; - //private readonly IRepository _repository; - //private readonly IRepository _repository; + private readonly IRepository _questionRegisterAnswerRrepository; + private readonly IRepository _questionRepository; + private readonly IRepository _questionAnswerRepository; - public QuestionRegisterAppService(IRepository repository) + public QuestionRegisterAppService(IRepository repository, + IRepository questionRegisterItemRepository, + IRepository questionRegisterAnswerRrepository, + IRepository questionRepository, + IRepository questionAnswerRepository) { _repository = repository; + _questionRegisterItemRepository = questionRegisterItemRepository; + _questionRegisterAnswerRrepository = questionRegisterAnswerRrepository; + _questionRepository = questionRepository; + _questionAnswerRepository = questionAnswerRepository; } public async Task GetByPersonId(PersonIdInputDto input) diff --git a/src/Shentun.WebPeis.Domain/Models/DiseaseRiskLevel.cs b/src/Shentun.WebPeis.Domain/Models/DiseaseRiskLevel.cs index 8512fc5..3cd0b99 100644 --- a/src/Shentun.WebPeis.Domain/Models/DiseaseRiskLevel.cs +++ b/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 /// 疾病风险推荐的组合项目 /// + public virtual ICollection DiseaseRiskLevelAsbitems { get; set; } = new List(); public override object?[] GetKeys() diff --git a/src/Shentun.WebPeis.Domain/Models/Question.cs b/src/Shentun.WebPeis.Domain/Models/Question.cs index 228ce53..97453e4 100644 --- a/src/Shentun.WebPeis.Domain/Models/Question.cs +++ b/src/Shentun.WebPeis.Domain/Models/Question.cs @@ -35,6 +35,11 @@ public partial class Question : AuditedEntity, IHasConcurrencyStamp public char? AnswerType { get; set; } /// + /// 问卷性质ID + /// + + public string QuestionNatureId { get; set; } + /// /// 启用 /// diff --git a/src/Shentun.WebPeis.Domain/Models/QuestionAnswer.cs b/src/Shentun.WebPeis.Domain/Models/QuestionAnswer.cs index b5e142d..e9e685f 100644 --- a/src/Shentun.WebPeis.Domain/Models/QuestionAnswer.cs +++ b/src/Shentun.WebPeis.Domain/Models/QuestionAnswer.cs @@ -39,11 +39,6 @@ public partial class QuestionAnswer : AuditedEntity, IHasConcurrencyStamp /// public char? AnswerResultType { get; set; } - /// - /// 答案对应的疾病风险级别ID - /// - - public Guid? DiseaseRiskLevelId { get; set; } /// /// 父答案ID diff --git a/src/Shentun.WebPeis.Domain/Models/QuestionNature.cs b/src/Shentun.WebPeis.Domain/Models/QuestionNature.cs new file mode 100644 index 0000000..b4f2c2e --- /dev/null +++ b/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 + { + /// + /// 主键 + /// + public string QuestionNatureId { get; set; } + /// + /// 名称 + /// + + 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]; + } + } +} diff --git a/src/Shentun.WebPeis.EntityFrameworkCore/Configures/DiseaseRiskLevelConfigure.cs b/src/Shentun.WebPeis.EntityFrameworkCore/Configures/DiseaseRiskLevelConfigure.cs index 50a107c..25a14a6 100644 --- a/src/Shentun.WebPeis.EntityFrameworkCore/Configures/DiseaseRiskLevelConfigure.cs +++ b/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) diff --git a/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionConfigure.cs b/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionConfigure.cs index f2572bd..34810fb 100644 --- a/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionConfigure.cs +++ b/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"); diff --git a/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionNatureConfigure.cs b/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionNatureConfigure.cs new file mode 100644 index 0000000..3276214 --- /dev/null +++ b/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 + { + public void Configure(EntityTypeBuilder 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"); + } + } +} diff --git a/src/Shentun.WebPeis.EntityFrameworkCore/EntityFrameworkCore/WebPeisDbContext.cs b/src/Shentun.WebPeis.EntityFrameworkCore/EntityFrameworkCore/WebPeisDbContext.cs index 1ce068f..31e543e 100644 --- a/src/Shentun.WebPeis.EntityFrameworkCore/EntityFrameworkCore/WebPeisDbContext.cs +++ b/src/Shentun.WebPeis.EntityFrameworkCore/EntityFrameworkCore/WebPeisDbContext.cs @@ -181,6 +181,7 @@ public partial class WebPeisDbContext : AbpDbContext, public virtual DbSet PersonKinships { get; set; } + public virtual DbSet QuestionNatures { get; set; } public virtual DbSet Questions { get; set; } public virtual DbSet QuestionAnswers { get; set; }