diff --git a/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs b/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs index c63bb80..64fa3b1 100644 --- a/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs +++ b/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs @@ -270,7 +270,7 @@ namespace Shentun.Peis.PatientRegisters entlist = entlist.Where(m => m.PatientRegisterNo == input.PatientRegisterNo); if (input.SexId != null) - if (input.SexId.ToString() != Enum.GetName(typeof(ForSexEnum), ForSexEnum.A)) + if (input.SexId.ToString() != ForSexFlag.All) entlist = entlist.Where(m => m.SexId == input.SexId); if (!string.IsNullOrEmpty(input.StartDate) && !string.IsNullOrEmpty(input.EndDate)) @@ -603,7 +603,7 @@ namespace Shentun.Peis.PatientRegisters /// public override async Task DeleteAsync(Guid id) { - await _manager.CheckAndDeleteAsync(id); + await _manager.CheckDeleteAsync(id); } @@ -623,7 +623,7 @@ namespace Shentun.Peis.PatientRegisters { foreach (var ent in entlist) { - await _manager.CheckAndDeleteAsync(ent.Id); + await _manager.CheckDeleteAsync(ent.Id); } } diff --git a/src/Shentun.Peis.Domain.Shared/Enums/ForSexEnum.cs b/src/Shentun.Peis.Domain.Shared/Enums/ForSexFlag.cs similarity index 76% rename from src/Shentun.Peis.Domain.Shared/Enums/ForSexEnum.cs rename to src/Shentun.Peis.Domain.Shared/Enums/ForSexFlag.cs index b43d2cc..3bfd1ce 100644 --- a/src/Shentun.Peis.Domain.Shared/Enums/ForSexEnum.cs +++ b/src/Shentun.Peis.Domain.Shared/Enums/ForSexFlag.cs @@ -8,22 +8,22 @@ namespace Shentun.Peis.Enums /// /// 适用性别枚举 M-男,F-女,A-全部 /// - public enum ForSexEnum + public static class ForSexFlag { /// /// 男 /// [Description("男")] - M, + public const string Male = "M"; /// /// 女 /// [Description("女")] - F, + public const string Female = "F"; /// /// 全部 /// [Description("全部")] - A + public const string All = "A"; } } diff --git a/src/Shentun.Peis.Domain.Shared/Enums/ResultStatusEnum.cs b/src/Shentun.Peis.Domain.Shared/Enums/ResultStatusEnum.cs index a26cec0..b1ba107 100644 --- a/src/Shentun.Peis.Domain.Shared/Enums/ResultStatusEnum.cs +++ b/src/Shentun.Peis.Domain.Shared/Enums/ResultStatusEnum.cs @@ -9,14 +9,15 @@ namespace Shentun.Peis.Enums /// public static class ResultStatusEnum { - public const string 正常 = "01"; - public const string 错误 = "02"; - public const string 阴性 = "03"; - public const string 阳性 = "04"; - public const string 弱阳性 = "05"; - public const string 偏低 = "06"; - public const string 偏高 = "07"; - public const string 警告下限 = "08"; - public const string 警告上限 = "09"; + public const string Normal = "01"; + public const string Error = "02"; + public const string Negative = "03"; + public const string Positive = "04"; + public const string WeakPositive = "05"; + public const string Low = "06"; + public const string High = "07"; + public const string CriticalValueLowerLimit = "08"; + public const string CriticalValueUpperLimit = "09"; + public const string CriticalValue = "10"; } } diff --git a/src/Shentun.Peis.Domain.Shared/Enums/SexEnum.cs b/src/Shentun.Peis.Domain.Shared/Enums/SexFlag.cs similarity index 76% rename from src/Shentun.Peis.Domain.Shared/Enums/SexEnum.cs rename to src/Shentun.Peis.Domain.Shared/Enums/SexFlag.cs index 0e9a864..24ca0a5 100644 --- a/src/Shentun.Peis.Domain.Shared/Enums/SexEnum.cs +++ b/src/Shentun.Peis.Domain.Shared/Enums/SexFlag.cs @@ -8,22 +8,22 @@ namespace Shentun.Peis.Enums /// /// 性别枚举 M-男,F-女,U-未知 /// - public enum SexEnum + public static class SexFlag { /// /// 男 /// [Description("男")] - M, + public const string Male = "M"; /// /// 女 /// [Description("女")] - F, + public const string Female = "F"; /// /// 未知 /// [Description("未知")] - U + public const string UnKnown = "U"; } } diff --git a/src/Shentun.Peis.Domain/AsbitemGuides/AsbitemGuideManager.cs b/src/Shentun.Peis.Domain/AsbitemGuides/AsbitemGuideManager.cs index 4732ea2..ff5a274 100644 --- a/src/Shentun.Peis.Domain/AsbitemGuides/AsbitemGuideManager.cs +++ b/src/Shentun.Peis.Domain/AsbitemGuides/AsbitemGuideManager.cs @@ -30,10 +30,10 @@ namespace Shentun.Peis.AsbitemGuides { //以体检中心跟组合项目去查 var entlist = _asbitemGuideRepository.GetListAsync(m => m.OrganizationUnitId == OrOrganizationUnitId && m.AsbitemId == AsbitemId).Result; - if (Enum.GetName(typeof(SexEnum), SexEnum.U) == SexId.ToString()) + if (SexFlag.UnKnown == SexId.ToString()) { //判断是否为未知、未知去找适用性别为全部的 - entlist = entlist.Where(m => m.ForSexId.ToString() == Enum.GetName(typeof(ForSexEnum), ForSexEnum.A)).ToList(); + entlist = entlist.Where(m => m.ForSexId.ToString() == ForSexFlag.All).ToList(); } else { @@ -41,7 +41,7 @@ namespace Shentun.Peis.AsbitemGuides if (!entlist.Any()) { //找不到直接匹配的 去找全部的匹配数据 - entlist = entlist.Where(m => m.ForSexId.ToString() == Enum.GetName(typeof(ForSexEnum), ForSexEnum.A)).ToList(); + entlist = entlist.Where(m => m.ForSexId.ToString() == ForSexFlag.All).ToList(); } } @@ -54,8 +54,5 @@ namespace Shentun.Peis.AsbitemGuides return ""; } } - - - } } diff --git a/src/Shentun.Peis.EntityFrameworkCore/SumSummaryReports/SumSummaryReportRepository.cs b/src/Shentun.Peis.EntityFrameworkCore/SumSummaryReports/SumSummaryReportRepository.cs index 6b509e5..e7f702d 100644 --- a/src/Shentun.Peis.EntityFrameworkCore/SumSummaryReports/SumSummaryReportRepository.cs +++ b/src/Shentun.Peis.EntityFrameworkCore/SumSummaryReports/SumSummaryReportRepository.cs @@ -86,7 +86,7 @@ namespace Shentun.Peis.SumSummaryReports //数字型 if (SexId != null && Age != null) { - ReferenceRangeList = ReferenceRangeList.Where(m => (m.ForSexId == SexId || m.ForSexId.ToString() == Enum.GetName(typeof(ForSexEnum), ForSexEnum.A)) + ReferenceRangeList = ReferenceRangeList.Where(m => (m.ForSexId == SexId || m.ForSexId.ToString() == Enum.GetName(typeof(ForSexFlag), ForSexFlag.All)) && m.AgeLowerLimit <= Age && m.AgeUpperLimit >= Age).ToList(); //查询性别跟年龄(性别增加全部) msg = ReferenceRangeList.Any() ? ReferenceRangeList.First().ReferenceRangeValue : "";