From 17e9371586069e672588660d9d620c7993f36de9 Mon Sep 17 00:00:00 2001 From: wxd <123@qq.com> Date: Wed, 8 Jan 2025 17:23:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=8A=E6=96=AD=E5=A2=9E=E5=8A=A0=E5=90=AF?= =?UTF-8?q?=E7=94=A8=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Diagnosises/CreateDiagnosisDto.cs | 7 ++++++- .../Diagnosises/DiagnosisDto.cs | 5 +++++ .../Diagnosises/UpdateDiagnosisDto.cs | 5 +++++ .../Diagnosises/DiagnosisAppService.cs | 9 +++++---- src/Shentun.Peis.Domain/Diagnosises/Diagnosis.cs | 8 ++++++++ .../DbMapping/Diagnosises/DiagnosisDbMapping.cs | 1 + 6 files changed, 30 insertions(+), 5 deletions(-) diff --git a/src/Shentun.Peis.Application.Contracts/Diagnosises/CreateDiagnosisDto.cs b/src/Shentun.Peis.Application.Contracts/Diagnosises/CreateDiagnosisDto.cs index d8ff2a0..e483181 100644 --- a/src/Shentun.Peis.Application.Contracts/Diagnosises/CreateDiagnosisDto.cs +++ b/src/Shentun.Peis.Application.Contracts/Diagnosises/CreateDiagnosisDto.cs @@ -34,6 +34,11 @@ namespace Shentun.Peis.Diagnosises /// 诊断级别 /// public short DiagnosisLevelId { get; set; } - + + /// + /// 是否启用 + /// + public char IsActive { get; set; } = 'Y'; + } } diff --git a/src/Shentun.Peis.Application.Contracts/Diagnosises/DiagnosisDto.cs b/src/Shentun.Peis.Application.Contracts/Diagnosises/DiagnosisDto.cs index f79d4bd..62b417a 100644 --- a/src/Shentun.Peis.Application.Contracts/Diagnosises/DiagnosisDto.cs +++ b/src/Shentun.Peis.Application.Contracts/Diagnosises/DiagnosisDto.cs @@ -33,6 +33,11 @@ namespace Shentun.Peis.Diagnosises /// 适用性别 /// public char ForSexId { get; set; } + + /// + /// 是否启用 + /// + public char IsActive { get; set; } /// /// 诊断级别 /// diff --git a/src/Shentun.Peis.Application.Contracts/Diagnosises/UpdateDiagnosisDto.cs b/src/Shentun.Peis.Application.Contracts/Diagnosises/UpdateDiagnosisDto.cs index f16ba42..1362cd3 100644 --- a/src/Shentun.Peis.Application.Contracts/Diagnosises/UpdateDiagnosisDto.cs +++ b/src/Shentun.Peis.Application.Contracts/Diagnosises/UpdateDiagnosisDto.cs @@ -35,5 +35,10 @@ namespace Shentun.Peis.Diagnosises /// public short DiagnosisLevelId { get; set; } + /// + /// 是否启用 + /// + public char IsActive { get; set; } = 'Y'; + } } diff --git a/src/Shentun.Peis.Application/Diagnosises/DiagnosisAppService.cs b/src/Shentun.Peis.Application/Diagnosises/DiagnosisAppService.cs index 9e47b6c..b8371f7 100644 --- a/src/Shentun.Peis.Application/Diagnosises/DiagnosisAppService.cs +++ b/src/Shentun.Peis.Application/Diagnosises/DiagnosisAppService.cs @@ -143,7 +143,7 @@ namespace Shentun.Peis.Diagnosises IsSummaryTemplate = s.FirstOrDefault().a.IsSummaryTemplate, ItemTypeId = s.FirstOrDefault().a.ItemTypeId, SuggestionName = s.FirstOrDefault().a.SuggestionName, - + IsActive = s.FirstOrDefault().a.IsActive, MedicalInterpretations = s.Where(m => m.ab != null && m.ab.SuggestionType == SuggestionTypeFlag.MedicalInterpretation).Select(ss => new SuggestionDto { CreationTime = ss.ab.CreationTime, @@ -202,10 +202,10 @@ namespace Shentun.Peis.Diagnosises [HttpPost("api/app/Diagnosis/GetSimpleList")] public async Task> GetSimpleListAsync() { - var diagnosisList = await Repository.GetListAsync(); + var diagnosisList = await Repository.GetListAsync(m => m.IsActive == 'Y'); var entlist = diagnosisList.Select(s => new SimpleDiagnosisDto { - + DisplayName = s.DisplayName, Id = s.Id, SimpleCode = s.SimpleCode @@ -216,7 +216,7 @@ namespace Shentun.Peis.Diagnosises /// - /// 获取诊断列表，加诊断建议 + /// 获取诊断列表，加诊断建议 总检医生诊台使用,增加是否启用状态筛选 /// /// [HttpPost("api/app/Diagnosis/GetSimpleDiagnosisWithSuggestions")] @@ -225,6 +225,7 @@ namespace Shentun.Peis.Diagnosises var query = from a in await Repository.GetQueryableAsync() join b in await _suggestionRepository.GetQueryableAsync() on a.Id equals b.DiagnosisId into bb from ab in bb.DefaultIfEmpty() + where a.IsActive == 'Y' select new { a = new diff --git a/src/Shentun.Peis.Domain/Diagnosises/Diagnosis.cs b/src/Shentun.Peis.Domain/Diagnosises/Diagnosis.cs index ed339c1..34caa00 100644 --- a/src/Shentun.Peis.Domain/Diagnosises/Diagnosis.cs +++ b/src/Shentun.Peis.Domain/Diagnosises/Diagnosis.cs @@ -72,6 +72,14 @@ namespace Shentun.Peis.Models public string SimpleCode { get; set; } = null!; [Column("display_order")] public int DisplayOrder { get; set; } + + /// + /// 是否启用 + /// + [Column("is_active")] + [MaxLength(1)] + public char IsActive { get; set; } + //[Column("last_modifier_id")] //public Guid LastModifierId { get; set; } //[Column("last_modification_time", TypeName = "timestamp without time zone")] diff --git a/src/Shentun.Peis.EntityFrameworkCore/DbMapping/Diagnosises/DiagnosisDbMapping.cs b/src/Shentun.Peis.EntityFrameworkCore/DbMapping/Diagnosises/DiagnosisDbMapping.cs index e74cd49..2f8f2ec 100644 --- a/src/Shentun.Peis.EntityFrameworkCore/DbMapping/Diagnosises/DiagnosisDbMapping.cs +++ b/src/Shentun.Peis.EntityFrameworkCore/DbMapping/Diagnosises/DiagnosisDbMapping.cs @@ -23,6 +23,7 @@ namespace Shentun.Peis.DbMapping entity.Property(t => t.IsSummaryTemplate).HasComment("是总检模板").IsRequired().HasDefaultValueSql("'N'"); entity.Property(t => t.ForSexId).HasComment("适用性别").IsRequired().HasDefaultValueSql("'A'"); entity.Property(t => t.DiagnosisLevelId).HasComment("诊断级别").IsRequired(); + entity.Property(t => t.IsActive).HasComment("是否启用").IsRequired().HasDefaultValueSql("'Y'"); entity.Property(e => e.Id).IsFixedLength();