From b130f30e4b80557b8a080d492eee1384d600a71e Mon Sep 17 00:00:00 2001 From: wxd <123@qq.com> Date: Thu, 8 Jan 2026 11:23:44 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E5=90=88=E9=A1=B9=E7=9B=AE=E6=8A=98?= =?UTF-8?q?=E6=89=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Asbitems/AsbitemDto.cs | 6 ++++++ .../Asbitems/CreateAsbitemDto.cs | 6 ++++++ .../Asbitems/UpdateAsbitemDto.cs | 5 +++++ .../RegisterCheckAsbitemOrAsbitemDto.cs | 5 +++++ src/Shentun.Peis.Application/Asbitems/AsbitemAppService.cs | 5 +++-- .../MedicalPackageDetails/MedicalPackageDetailAppService.cs | 4 +++- .../PatientRegisters/PatientRegisterAppService.cs | 3 ++- src/Shentun.Peis.Domain/Asbitems/Asbitem.cs | 6 ++++++ src/Shentun.Peis.Domain/Asbitems/AsbitemEntity.cs | 6 ++++++ src/Shentun.Peis.Domain/Asbitems/AsbitemManager.cs | 5 ++++- .../CustomerOrgGroupDetailRepository.cs | 4 +++- .../DbMapping/Asbitems/AsbitemDbMapping.cs | 4 +++- 12 files changed, 52 insertions(+), 7 deletions(-) diff --git a/src/Shentun.Peis.Application.Contracts/Asbitems/AsbitemDto.cs b/src/Shentun.Peis.Application.Contracts/Asbitems/AsbitemDto.cs index e2d4201e..baf6bd90 100644 --- a/src/Shentun.Peis.Application.Contracts/Asbitems/AsbitemDto.cs +++ b/src/Shentun.Peis.Application.Contracts/Asbitems/AsbitemDto.cs @@ -189,5 +189,11 @@ namespace Shentun.Peis.Asbitems /// 是否外检项目 /// public char IsOutsend { get; set; } + + + /// + /// 是否折扣 默认Y + /// + public char IsDiscount { get; set; } } } diff --git a/src/Shentun.Peis.Application.Contracts/Asbitems/CreateAsbitemDto.cs b/src/Shentun.Peis.Application.Contracts/Asbitems/CreateAsbitemDto.cs index f41cd4ba..44d683e0 100644 --- a/src/Shentun.Peis.Application.Contracts/Asbitems/CreateAsbitemDto.cs +++ b/src/Shentun.Peis.Application.Contracts/Asbitems/CreateAsbitemDto.cs @@ -184,5 +184,11 @@ namespace Shentun.Peis.Asbitems /// 是否外检项目 /// public char IsOutsend { get; set; } = 'N'; + + /// + /// 是否折扣 默认Y + /// + public char IsDiscount { get; set; } = 'Y'; + } } diff --git a/src/Shentun.Peis.Application.Contracts/Asbitems/UpdateAsbitemDto.cs b/src/Shentun.Peis.Application.Contracts/Asbitems/UpdateAsbitemDto.cs index 81c49aaf..9888aeaf 100644 --- a/src/Shentun.Peis.Application.Contracts/Asbitems/UpdateAsbitemDto.cs +++ b/src/Shentun.Peis.Application.Contracts/Asbitems/UpdateAsbitemDto.cs @@ -182,5 +182,10 @@ namespace Shentun.Peis.Asbitems /// 是否外检项目 /// public char IsOutsend { get; set; } = 'N'; + + /// + /// 是否折扣 默认Y + /// + public char IsDiscount { get; set; } = 'Y'; } } diff --git a/src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/RegisterCheckAsbitemOrAsbitemDto.cs b/src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/RegisterCheckAsbitemOrAsbitemDto.cs index 6649c880..2c5f1444 100644 --- a/src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/RegisterCheckAsbitemOrAsbitemDto.cs +++ b/src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/RegisterCheckAsbitemOrAsbitemDto.cs @@ -92,5 +92,10 @@ namespace Shentun.Peis.RegisterAsbitems /// [JsonIgnore] public int DisplayOrder { get; set; } + + /// + /// 是否折扣 默认Y + /// + public char IsDiscount { get; set; } } } diff --git a/src/Shentun.Peis.Application/Asbitems/AsbitemAppService.cs b/src/Shentun.Peis.Application/Asbitems/AsbitemAppService.cs index 027e68ac..3f655709 100644 --- a/src/Shentun.Peis.Application/Asbitems/AsbitemAppService.cs +++ b/src/Shentun.Peis.Application/Asbitems/AsbitemAppService.cs @@ -150,12 +150,13 @@ namespace Shentun.Peis.Asbitems FollowUpFunction = s.a.FollowUpFunction, IsCriticalValueFunction = s.a.IsCriticalValueFunction, IsFollowUpFunction = s.a.IsFollowUpFunction, - IsPrivacy = s.a.IsPrivacy, + IsPrivacy = s.a.IsPrivacy, //IsDisablePregnancy = s.a.IsDisablePregnancy, //IsDisablePreparePregnancy = s.a.IsDisablePreparePregnancy, CreatorName = s.ab != null ? s.ab.Surname : "", LastModifierName = s.ac != null ? s.ac.Surname : "", - IsOutsend = s.a.IsOutsend + IsOutsend = s.a.IsOutsend, + IsDiscount = s.a.IsDiscount }).OrderBy(o => o.DisplayOrder).ToList(); return entdto; diff --git a/src/Shentun.Peis.Application/MedicalPackageDetails/MedicalPackageDetailAppService.cs b/src/Shentun.Peis.Application/MedicalPackageDetails/MedicalPackageDetailAppService.cs index 722e5b1f..17302c32 100644 --- a/src/Shentun.Peis.Application/MedicalPackageDetails/MedicalPackageDetailAppService.cs +++ b/src/Shentun.Peis.Application/MedicalPackageDetails/MedicalPackageDetailAppService.cs @@ -149,7 +149,9 @@ namespace Shentun.Peis.MedicalPackageDetails MedicalPackageDetailMoney = s.Amount * s.Price, MedicalPackageDetailPrice = s.Price, CreatorName = EntityHelper.GetSurnameNoSql(userList, s.Asbitem.CreatorId), - LastModifierName = EntityHelper.GetSurnameNoSql(userList, s.Asbitem.LastModifierId) + LastModifierName = EntityHelper.GetSurnameNoSql(userList, s.Asbitem.LastModifierId), + MaritalStatusId = s.Asbitem.MaritalStatusId, + IsDiscount = s.Asbitem.IsDiscount }).ToList(); return entdto; diff --git a/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs b/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs index 13af28a9..27faa19c 100644 --- a/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs +++ b/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs @@ -4182,7 +4182,8 @@ namespace Shentun.Peis.PatientRegisters SexName = _cacheService.GetForSexNameAsync(s.Asbitem.ForSexId).Result, StandardPrice = s.StandardPrice, CreatorName = _cacheService.GetSurnameAsync(s.CreatorId).GetAwaiter().GetResult(), - LastModifierName = _cacheService.GetSurnameAsync(s.LastModifierId).GetAwaiter().GetResult() + LastModifierName = _cacheService.GetSurnameAsync(s.LastModifierId).GetAwaiter().GetResult(), + IsDiscount = s.Asbitem.IsDiscount }).ToList(); //设置GroupPackageId if (entdto.CustomerOrgGroupId != null && entdto.CustomerOrgGroupId != Guid.Empty) diff --git a/src/Shentun.Peis.Domain/Asbitems/Asbitem.cs b/src/Shentun.Peis.Domain/Asbitems/Asbitem.cs index 39ef7861..1c267b3c 100644 --- a/src/Shentun.Peis.Domain/Asbitems/Asbitem.cs +++ b/src/Shentun.Peis.Domain/Asbitems/Asbitem.cs @@ -230,6 +230,12 @@ namespace Shentun.Peis.Models [Column("is_outsend")] public char IsOutsend { get; set; } + /// + /// 是否折扣 默认Y + /// + [Column("is_discount")] + public char IsDiscount { get; set; } + [Column("concurrency_stamp")] public string ConcurrencyStamp { get; set; } diff --git a/src/Shentun.Peis.Domain/Asbitems/AsbitemEntity.cs b/src/Shentun.Peis.Domain/Asbitems/AsbitemEntity.cs index f8fa39b7..956f6afd 100644 --- a/src/Shentun.Peis.Domain/Asbitems/AsbitemEntity.cs +++ b/src/Shentun.Peis.Domain/Asbitems/AsbitemEntity.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -120,5 +121,10 @@ namespace Shentun.Peis.Asbitems public int DisplayOrder { get; set; } + + /// + /// 是否折扣 默认Y + /// + public char IsDiscount { get; set; } } } diff --git a/src/Shentun.Peis.Domain/Asbitems/AsbitemManager.cs b/src/Shentun.Peis.Domain/Asbitems/AsbitemManager.cs index 126fe20c..95e53b5e 100644 --- a/src/Shentun.Peis.Domain/Asbitems/AsbitemManager.cs +++ b/src/Shentun.Peis.Domain/Asbitems/AsbitemManager.cs @@ -114,7 +114,8 @@ namespace Shentun.Peis.Asbitems CriticalValueFunction = entity.CriticalValueFunction, FollowUpFunction = entity.FollowUpFunction, IsPrivacy = entity.IsPrivacy, - IsOutsend = entity.IsOutsend + IsOutsend = entity.IsOutsend, + IsDiscount = entity.IsDiscount }; } /// @@ -169,6 +170,7 @@ namespace Shentun.Peis.Asbitems targetEntity.FollowUpFunction = sourceEntity.FollowUpFunction; targetEntity.IsPrivacy = sourceEntity.IsPrivacy; targetEntity.IsOutsend = sourceEntity.IsOutsend; + targetEntity.IsDiscount = sourceEntity.IsDiscount; } @@ -206,6 +208,7 @@ namespace Shentun.Peis.Asbitems DataHelper.CheckCharIsYOrN(entity.IsCriticalValueFunction, "是否启用危急值函数"); DataHelper.CheckCharIsYOrN(entity.IsFollowUpFunction, "是否启用随访函数"); DataHelper.CheckCharIsYOrN(entity.IsOutsend, "是否外检项目"); + DataHelper.CheckCharIsYOrN(entity.IsDiscount, "是否折扣"); } diff --git a/src/Shentun.Peis.EntityFrameworkCore/CustomerOrgGroupDetails/CustomerOrgGroupDetailRepository.cs b/src/Shentun.Peis.EntityFrameworkCore/CustomerOrgGroupDetails/CustomerOrgGroupDetailRepository.cs index b79a224d..a6ab0ef2 100644 --- a/src/Shentun.Peis.EntityFrameworkCore/CustomerOrgGroupDetails/CustomerOrgGroupDetailRepository.cs +++ b/src/Shentun.Peis.EntityFrameworkCore/CustomerOrgGroupDetails/CustomerOrgGroupDetailRepository.cs @@ -78,7 +78,9 @@ namespace Shentun.Peis.CustomerOrgGroupDetails LastModificationTime = a.LastModificationTime, LastModifierId = a.LastModifierId, CreatorName = ac != null ? ac.Surname : "", - LastModifierName = ad != null ? ad.Surname : "" + LastModifierName = ad != null ? ad.Surname : "", + IsDiscount = b.IsDiscount, + MaritalStatusId = b.MaritalStatusId }; return query.ToList(); diff --git a/src/Shentun.Peis.EntityFrameworkCore/DbMapping/Asbitems/AsbitemDbMapping.cs b/src/Shentun.Peis.EntityFrameworkCore/DbMapping/Asbitems/AsbitemDbMapping.cs index 62d42632..b3521847 100644 --- a/src/Shentun.Peis.EntityFrameworkCore/DbMapping/Asbitems/AsbitemDbMapping.cs +++ b/src/Shentun.Peis.EntityFrameworkCore/DbMapping/Asbitems/AsbitemDbMapping.cs @@ -44,7 +44,9 @@ namespace Shentun.Peis.DbMapping entity.Property(t => t.FollowUpFunction).HasComment("随访函数"); entity.Property(t => t.IsPrivacy).HasComment("是否隐私项目").IsRequired().HasDefaultValueSql("'N'"); entity.Property(t => t.IsOutsend).HasComment("是否外检项目").IsRequired().HasDefaultValueSql("'N'"); - + entity.Property(t => t.IsDiscount).HasComment("是否折扣").IsRequired().HasDefaultValueSql("'Y'"); + + entity.Property(e => e.Id) .IsFixedLength() .HasComment("编号").HasColumnName("id");