组合项目折扣

src/Shentun.Peis.Application.Contracts/Asbitems/AsbitemDto.cs

@@ -189,5 +189,11 @@ namespace Shentun.Peis.Asbitems
         /// 是否外检项目
         /// </summary>
         public char IsOutsend { get; set; }
+
+
+        /// <summary>
+        /// 是否折扣   默认Y
+        /// </summary>
+        public char IsDiscount { get; set; }
     }
 }

src/Shentun.Peis.Application.Contracts/Asbitems/CreateAsbitemDto.cs

@@ -184,5 +184,11 @@ namespace Shentun.Peis.Asbitems
         /// 是否外检项目
         /// </summary>
         public char IsOutsend { get; set; } = 'N';
+
+        /// <summary>
+        /// 是否折扣   默认Y
+        /// </summary>
+        public char IsDiscount { get; set; } = 'Y';
+
     }
 }

src/Shentun.Peis.Application.Contracts/Asbitems/UpdateAsbitemDto.cs

@@ -182,5 +182,10 @@ namespace Shentun.Peis.Asbitems
         /// 是否外检项目
         /// </summary>
         public char IsOutsend { get; set; } = 'N';
+
+        /// <summary>
+        /// 是否折扣   默认Y
+        /// </summary>
+        public char IsDiscount { get; set; } = 'Y';
     }
 }

src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/RegisterCheckAsbitemOrAsbitemDto.cs

@@ -92,5 +92,10 @@ namespace Shentun.Peis.RegisterAsbitems
         /// </summary>
         [JsonIgnore]
         public int  DisplayOrder { get; set; }
+
+        /// <summary>
+        /// 是否折扣   默认Y
+        /// </summary>
+        public char IsDiscount { get; set; }
     }
 }

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;

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;

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)

src/Shentun.Peis.Domain/Asbitems/Asbitem.cs

@@ -230,6 +230,12 @@ namespace Shentun.Peis.Models
         [Column("is_outsend")]
         public char IsOutsend { get; set; }
 
+        /// <summary>
+        /// 是否折扣   默认Y
+        /// </summary>
+        [Column("is_discount")]
+        public char IsDiscount { get; set; }
+
         [Column("concurrency_stamp")]
         public string ConcurrencyStamp { get; set; }
 

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; }
+
+        /// <summary>
+        /// 是否折扣   默认Y
+        /// </summary>
+        public char IsDiscount { get; set; }
     }
 }

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
             };
         }
         /// <summary>
@@ -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, "是否折扣");
         }
 
 

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

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