From 7c000634653ce412f0b6578b4f317f2ef7c71fa1 Mon Sep 17 00:00:00 2001 From: "DESKTOP-G961P6V\\Zhh" <839860190@qq.com> Date: Wed, 12 Jun 2024 23:23: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 --- .../Models/DiseaseRisk.cs | 12 +++++++++ .../Models/DiseaseRiskLevel.cs | 25 ++++++++++++++++- .../Models/DiseaseRiskLevelAsbitem.cs | 9 +++++++ .../Models/DiseaseScreeningType.cs | 9 +++++++ src/Shentun.WebPeis.Domain/Models/Question.cs | 27 +++++++++++++++++++ .../Models/QuestionAnswer.cs | 24 +++++++++++++++++ .../Models/QuestionAnswerChild.cs | 9 +++++++ .../Models/QuestionRegister.cs | 14 ++++++++++ .../Models/QuestionRegisterAnswer.cs | 12 +++++++++ .../Models/QuestionRegisterAnswerChild.cs | 12 +++++++++ .../Models/QuestionRegisterItem.cs | 12 +++++++++ .../Models/QuestionType.cs | 11 +++++++- .../Configures/QuestionConfigure.cs | 2 +- .../Configures/QuestionTypeConfigure.cs | 2 +- 14 files changed, 176 insertions(+), 4 deletions(-) diff --git a/src/Shentun.WebPeis.Domain/Models/DiseaseRisk.cs b/src/Shentun.WebPeis.Domain/Models/DiseaseRisk.cs index 9a07689..698f5ac 100644 --- a/src/Shentun.WebPeis.Domain/Models/DiseaseRisk.cs +++ b/src/Shentun.WebPeis.Domain/Models/DiseaseRisk.cs @@ -6,9 +6,18 @@ using NPOI.OpenXmlFormats.Dml; namespace Shentun.WebPeis.Models; +/// +/// 疾病风险 +/// public partial class DiseaseRisk : AuditedEntity, IHasConcurrencyStamp { + /// + /// 主键 + /// public Guid DiseaseRiskId { get; set; } + /// + /// 名称 + /// public string DiseaseRiskName { get; set; } = null!; @@ -19,6 +28,9 @@ public partial class DiseaseRisk : AuditedEntity, IHasConcurrencyStamp public string? ConcurrencyStamp { get; set; } + /// + /// 包含的风险级别 + /// public virtual ICollection DiseaseRiskLevels { get; set; } = new List(); diff --git a/src/Shentun.WebPeis.Domain/Models/DiseaseRiskLevel.cs b/src/Shentun.WebPeis.Domain/Models/DiseaseRiskLevel.cs index 01572d6..8512fc5 100644 --- a/src/Shentun.WebPeis.Domain/Models/DiseaseRiskLevel.cs +++ b/src/Shentun.WebPeis.Domain/Models/DiseaseRiskLevel.cs @@ -5,11 +5,23 @@ using Volo.Abp.Domain.Entities; namespace Shentun.WebPeis.Models; +/// +/// 疾病风险级别 +/// public partial class DiseaseRiskLevel : AuditedEntity, IHasConcurrencyStamp { + /// + /// 风险级别ID + /// public Guid DiseaseRiskLevelId { get; set; } + /// + /// 风险级别名称 + /// public string DiseaseRiskLevelName { get; set; } = null!; + /// + /// 风险级别ID + /// public Guid DiseaseRiskId { get; set; } @@ -18,16 +30,27 @@ public partial class DiseaseRiskLevel : AuditedEntity, IHasConcurrencyStamp public int DisplayOrder { get; set; } - + /// + /// 风险标准级别ID，暂时废弃 + /// public short? DiseaseRiskNormalLevelId { get; set; } + /// + /// 解释 + /// public string? Explain { get; set; } + /// + /// 建议 + /// public string? Suggestion { get; set; } public virtual DiseaseRisk DiseaseRisk { get; set; } = null!; public string? ConcurrencyStamp { get; set; } + /// + /// 疾病风险推荐的组合项目 + /// public virtual ICollection DiseaseRiskLevelAsbitems { get; set; } = new List(); diff --git a/src/Shentun.WebPeis.Domain/Models/DiseaseRiskLevelAsbitem.cs b/src/Shentun.WebPeis.Domain/Models/DiseaseRiskLevelAsbitem.cs index eb44d41..7b1bb29 100644 --- a/src/Shentun.WebPeis.Domain/Models/DiseaseRiskLevelAsbitem.cs +++ b/src/Shentun.WebPeis.Domain/Models/DiseaseRiskLevelAsbitem.cs @@ -3,9 +3,18 @@ using System.Collections.Generic; namespace Shentun.WebPeis.Models; +/// +/// 疾病风险推荐的组合项目 +/// public partial class DiseaseRiskLevelAsbitem { + /// + /// 疾病风险级别ID + /// public Guid DiseaseRiskLevelId { get; set; } + /// + /// 组合项目ID + /// public Guid AsbitemId { get; set; } diff --git a/src/Shentun.WebPeis.Domain/Models/DiseaseScreeningType.cs b/src/Shentun.WebPeis.Domain/Models/DiseaseScreeningType.cs index 82520bb..c16cae7 100644 --- a/src/Shentun.WebPeis.Domain/Models/DiseaseScreeningType.cs +++ b/src/Shentun.WebPeis.Domain/Models/DiseaseScreeningType.cs @@ -8,9 +8,18 @@ using Volo.Abp.Domain.Entities; namespace Shentun.WebPeis.Models { + /// + /// 疾病筛查类别 + /// public partial class DiseaseScreeningType: AuditedEntity, IHasConcurrencyStamp { + /// + /// 主键 + /// public Guid DiseaseScreeningTypeId { get; set; } + /// + /// 名称 + /// public string DiseaseScreeningTypeName { get; set; } = null!; diff --git a/src/Shentun.WebPeis.Domain/Models/Question.cs b/src/Shentun.WebPeis.Domain/Models/Question.cs index 33d08bd..3aefc56 100644 --- a/src/Shentun.WebPeis.Domain/Models/Question.cs +++ b/src/Shentun.WebPeis.Domain/Models/Question.cs @@ -3,11 +3,23 @@ using System.Collections.Generic; namespace Shentun.WebPeis.Models; +/// +/// 问卷 +/// public partial class Question { + /// + /// 主键 + /// public Guid QuestionId { get; set; } + /// + /// 题目 + /// public string QuestionName { get; set; } = null!; + /// + /// 问卷类别ID + /// public char QuestionTypeId { get; set; } @@ -22,14 +34,29 @@ public partial class Question public DateTime LastModificationTime { get; set; } public Guid LastModifierId { get; set; } + /// + /// 档案类别 + /// public char? AnswerType { get; set; } + /// + /// 启用 + /// public char? IsActive { get; set; } + /// + /// 父问卷ID + /// public Guid? ParentId { get; set; } + /// + /// 编码路径 + /// public string? PathCode { get; set; } + /// + /// 问卷包含的项目 + /// public virtual ICollection QuestionRegisterItems { get; set; } = new List(); } diff --git a/src/Shentun.WebPeis.Domain/Models/QuestionAnswer.cs b/src/Shentun.WebPeis.Domain/Models/QuestionAnswer.cs index fc46b6d..733a1ef 100644 --- a/src/Shentun.WebPeis.Domain/Models/QuestionAnswer.cs +++ b/src/Shentun.WebPeis.Domain/Models/QuestionAnswer.cs @@ -3,11 +3,23 @@ using System.Collections.Generic; namespace Shentun.WebPeis.Models; +/// +/// 问卷答案 +/// public partial class QuestionAnswer { + /// + /// 主键 + /// public Guid QuestionAnswerId { get; set; } + /// + /// 答案 + /// public string QuestionAnswerName { get; set; } = null!; + /// + /// 问卷ID + /// public Guid QuestionId { get; set; } @@ -22,12 +34,24 @@ public partial class QuestionAnswer public DateTime LastModificationTime { get; set; } public Guid LastModifierId { get; set; } + /// + /// 有子答案 + /// public char? IsHaveChild { get; set; } + /// + /// 子答案类别 + /// public char? ChildAnswerType { get; set; } + /// + /// 答案结果类别 + /// public char? AnswerResultType { get; set; } + /// + /// 答案对应的疾病风险级别ID + /// public Guid? DiseaseRiskLevelId { get; set; } diff --git a/src/Shentun.WebPeis.Domain/Models/QuestionAnswerChild.cs b/src/Shentun.WebPeis.Domain/Models/QuestionAnswerChild.cs index b6df65b..2e14e49 100644 --- a/src/Shentun.WebPeis.Domain/Models/QuestionAnswerChild.cs +++ b/src/Shentun.WebPeis.Domain/Models/QuestionAnswerChild.cs @@ -3,9 +3,18 @@ using System.Collections.Generic; namespace Shentun.WebPeis.Models; +/// +/// 子答案 +/// public partial class QuestionAnswerChild { + /// + /// 主键 + /// public Guid QuestionAnswerChildId { get; set; } + /// + /// 子答案 + /// public string QuestionAnswerChildName { get; set; } = null!; diff --git a/src/Shentun.WebPeis.Domain/Models/QuestionRegister.cs b/src/Shentun.WebPeis.Domain/Models/QuestionRegister.cs index c907423..d167361 100644 --- a/src/Shentun.WebPeis.Domain/Models/QuestionRegister.cs +++ b/src/Shentun.WebPeis.Domain/Models/QuestionRegister.cs @@ -3,12 +3,23 @@ using System.Collections.Generic; namespace Shentun.WebPeis.Models; +/// +/// 问卷登记 +/// public partial class QuestionRegister { + /// + /// 主键 + /// public Guid QuestionRegisterId { get; set; } + /// + /// 人员ID + /// public Guid PersonId { get; set; } + + public DateTime CreationTime { get; set; } public Guid CreatorId { get; set; } @@ -18,6 +29,9 @@ public partial class QuestionRegister public Guid LastModifierId { get; set; } public virtual Person Person { get; set; } = null!; + /// + /// 登记的问卷项目 + /// public virtual ICollection QuestionRegisterItems { get; set; } = new List(); } diff --git a/src/Shentun.WebPeis.Domain/Models/QuestionRegisterAnswer.cs b/src/Shentun.WebPeis.Domain/Models/QuestionRegisterAnswer.cs index 87f0198..b00bdb5 100644 --- a/src/Shentun.WebPeis.Domain/Models/QuestionRegisterAnswer.cs +++ b/src/Shentun.WebPeis.Domain/Models/QuestionRegisterAnswer.cs @@ -3,11 +3,23 @@ using System.Collections.Generic; namespace Shentun.WebPeis.Models; +/// +/// 预约人员问卷答案 +/// public partial class QuestionRegisterAnswer { + /// + /// 主键 + /// public Guid QuestionRegisterAnswerId { get; set; } + /// + /// 登记的问卷项目ID + /// public Guid QuestionRegisterItemId { get; set; } + /// + /// 答案ID + /// public Guid QuestionAnswerId { get; set; } diff --git a/src/Shentun.WebPeis.Domain/Models/QuestionRegisterAnswerChild.cs b/src/Shentun.WebPeis.Domain/Models/QuestionRegisterAnswerChild.cs index 9fcb693..11d3f51 100644 --- a/src/Shentun.WebPeis.Domain/Models/QuestionRegisterAnswerChild.cs +++ b/src/Shentun.WebPeis.Domain/Models/QuestionRegisterAnswerChild.cs @@ -3,11 +3,23 @@ using System.Collections.Generic; namespace Shentun.WebPeis.Models; +/// +/// 预约人员问卷题目子答案 +/// public partial class QuestionRegisterAnswerChild { + /// + /// 主键 + /// public Guid QuestionRegisterAnswerChildId { get; set; } + /// + /// 答案ID + /// public Guid QuestionRegisterAnswerId { get; set; } + /// + /// 自填写内容 + /// public string? Content { get; set; } diff --git a/src/Shentun.WebPeis.Domain/Models/QuestionRegisterItem.cs b/src/Shentun.WebPeis.Domain/Models/QuestionRegisterItem.cs index bc0e554..8cef154 100644 --- a/src/Shentun.WebPeis.Domain/Models/QuestionRegisterItem.cs +++ b/src/Shentun.WebPeis.Domain/Models/QuestionRegisterItem.cs @@ -3,11 +3,23 @@ using System.Collections.Generic; namespace Shentun.WebPeis.Models; +/// +/// 预约人员登记的问卷项目 +/// public partial class QuestionRegisterItem { + /// + /// 主键 + /// public Guid QuestionRegisterItemId { get; set; } + /// + /// 问卷登记ID + /// public Guid QuestionRegisterId { get; set; } + /// + /// 问卷ID + /// public Guid QuestionId { get; set; } diff --git a/src/Shentun.WebPeis.Domain/Models/QuestionType.cs b/src/Shentun.WebPeis.Domain/Models/QuestionType.cs index 63818d7..0fca364 100644 --- a/src/Shentun.WebPeis.Domain/Models/QuestionType.cs +++ b/src/Shentun.WebPeis.Domain/Models/QuestionType.cs @@ -3,9 +3,18 @@ using System.Collections.Generic; namespace Shentun.WebPeis.Models; +/// +/// 问卷类别 01-小程序健康问卷 +/// public partial class QuestionType { - public Guid QuestionTypeId { get; set; } + /// + /// 主键 + /// + public char QuestionTypeId { get; set; } + /// + /// 名称 + /// public string QuestionTypeName { get; set; } = null!; diff --git a/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionConfigure.cs b/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionConfigure.cs index 84b6e61..15372dc 100644 --- a/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionConfigure.cs +++ b/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionConfigure.cs @@ -47,7 +47,7 @@ namespace Shentun.WebPeis.Configures entity.Property(e => e.QuestionName) .HasMaxLength(20) .HasColumnName("question_name"); - entity.Property(e => e.QuestionTypeId).HasColumnName("question_type_id"); + entity.Property(e => e.QuestionTypeId).HasMaxLength(2).HasColumnName("question_type_id"); entity.Property(e => e.SimpleCode) .HasMaxLength(20) .HasColumnName("simple_code"); diff --git a/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionTypeConfigure.cs b/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionTypeConfigure.cs index d095250..1254f86 100644 --- a/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionTypeConfigure.cs +++ b/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionTypeConfigure.cs @@ -19,7 +19,7 @@ namespace Shentun.WebPeis.Configures entity.HasIndex(e => e.QuestionTypeName, "ix_question_type").IsUnique(); entity.Property(e => e.QuestionTypeId) - .ValueGeneratedNever() + .HasMaxLength(2) .HasColumnName("question_type_id"); entity.Property(e => e.CreationTime) .HasColumnType("timestamp(6) without time zone")