诊断增加启用状态

src/Shentun.Peis.Application.Contracts/Diagnosises/CreateDiagnosisDto.cs

@@ -34,6 +34,11 @@ namespace Shentun.Peis.Diagnosises
         /// 诊断级别
         /// </summary>
         public short DiagnosisLevelId { get; set; }
-       
+
+        /// <summary>
+        /// 是否启用
+        /// </summary>
+        public char IsActive { get; set; } = 'Y';
+
     }
 }

src/Shentun.Peis.Application.Contracts/Diagnosises/DiagnosisDto.cs

@@ -33,6 +33,11 @@ namespace Shentun.Peis.Diagnosises
         /// 适用性别
         /// </summary>
         public char ForSexId { get; set; }
+
+        /// <summary>
+        /// 是否启用
+        /// </summary>
+        public char IsActive { get; set; }
         /// <summary>
         /// 诊断级别
         /// </summary>

src/Shentun.Peis.Application.Contracts/Diagnosises/UpdateDiagnosisDto.cs

@@ -35,5 +35,10 @@ namespace Shentun.Peis.Diagnosises
         /// </summary>
         public short DiagnosisLevelId { get; set; }
 
+        /// <summary>
+        /// 是否启用
+        /// </summary>
+        public char IsActive { get; set; } = 'Y';
+
     }
 }

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<List<SimpleDiagnosisDto>> 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
 
 
         /// <summary>
-        /// 获取诊断列表，加诊断建议
+        /// 获取诊断列表，加诊断建议  总检医生诊台使用,增加是否启用状态筛选
         /// </summary>
         /// <returns></returns>
         [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

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; }
+
+        /// <summary>
+        /// 是否启用
+        /// </summary>
+        [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")]

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();