From 8a1e9651289afe3a52440e2f6c79b4bb359f9c13 Mon Sep 17 00:00:00 2001
From: wxd <123@qq.com>
Date: Thu, 2 May 2024 19:27:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B1=87=E6=80=BB=E9=A1=B9=E7=9B=AE=E7=B1=BB?=
 =?UTF-8?q?=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
 .../Asbitems/AsbitemDto.cs                    |     8 +-
 .../Asbitems/AsbitemAppService.cs             |     2 +-
 .../ChargeReports/ChargeReportAppService.cs   |    19 +-
 .../BaseDataHandleAppService.cs               |     2 +-
 .../MedicalPackageDetailAppService.cs         |     2 +-
 .../SampleGroupDetailAppService.cs            |     2 +-
 src/Shentun.Peis.Domain/Asbitems/Asbitem.cs   |    24 +-
 .../Asbitems/AsbitemEntity.cs                 |     8 +-
 .../Asbitems/AsbitemManager.cs                |     9 +-
 .../CollectItemTypes/CollectItemType.cs       |    63 +
 .../InvoiceItemTypes/InvoiceItemType.cs       |    11 +-
 .../InvoiceItemTypeManager.cs                 |    12 +-
 .../CustomerOrgGroupDetailRepository.cs       |     2 +-
 .../DbMapping/Asbitems/AsbitemDbMapping.cs    |     8 +-
 ...20240502112155_init20240502001.Designer.cs | 14136 +++++++++++++++
 .../20240502112155_init20240502001.cs         |   114 +
 ...20240502112642_init20240502002.Designer.cs | 14151 ++++++++++++++++
 .../20240502112642_init20240502002.cs         |    35 +
 .../Migrations/PeisDbContextModelSnapshot.cs  |   111 +-
 19 files changed, 28657 insertions(+), 62 deletions(-)
 create mode 100644 src/Shentun.Peis.Domain/CollectItemTypes/CollectItemType.cs
 create mode 100644 src/Shentun.Peis.EntityFrameworkCore/Migrations/20240502112155_init20240502001.Designer.cs
 create mode 100644 src/Shentun.Peis.EntityFrameworkCore/Migrations/20240502112155_init20240502001.cs
 create mode 100644 src/Shentun.Peis.EntityFrameworkCore/Migrations/20240502112642_init20240502002.Designer.cs
 create mode 100644 src/Shentun.Peis.EntityFrameworkCore/Migrations/20240502112642_init20240502002.cs
diff --git a/src/Shentun.Peis.Application.Contracts/Asbitems/AsbitemDto.cs b/src/Shentun.Peis.Application.Contracts/Asbitems/AsbitemDto.cs
index 1155beb..731075c 100644
--- a/src/Shentun.Peis.Application.Contracts/Asbitems/AsbitemDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/Asbitems/AsbitemDto.cs
@@ -42,10 +42,10 @@ namespace Shentun.Peis.Asbitems
         public Guid? DeviceTypeId { get; set; }
 
 
-        /// 
-        /// 发票类别
-        /// 
-        public Guid InvoiceItemTypeId { get; set; }
+        ///// 
+        ///// 发票类别
+        ///// 
+        //public Guid InvoiceItemTypeId { get; set; }
 
 
         /// 
diff --git a/src/Shentun.Peis.Application/Asbitems/AsbitemAppService.cs b/src/Shentun.Peis.Application/Asbitems/AsbitemAppService.cs
index 61309df..c91014a 100644
--- a/src/Shentun.Peis.Application/Asbitems/AsbitemAppService.cs
+++ b/src/Shentun.Peis.Application/Asbitems/AsbitemAppService.cs
@@ -122,7 +122,7 @@ namespace Shentun.Peis.Asbitems
                 DisplayOrder = s.a.DisplayOrder,
                 ForSexId = s.a.ForSexId,
                 Id = s.a.Id,
-                InvoiceItemTypeId = s.a.InvoiceItemTypeId,
+                //InvoiceItemTypeId = s.a.InvoiceItemTypeId,
                 IsActive = s.a.IsActive,
                 IsBeforeEat = s.a.IsBeforeEat,
                 IsCheck = s.a.IsCheck,
diff --git a/src/Shentun.Peis.Application/ChargeReports/ChargeReportAppService.cs b/src/Shentun.Peis.Application/ChargeReports/ChargeReportAppService.cs
index e9f3805..581576c 100644
--- a/src/Shentun.Peis.Application/ChargeReports/ChargeReportAppService.cs
+++ b/src/Shentun.Peis.Application/ChargeReports/ChargeReportAppService.cs
@@ -5,6 +5,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using NPOI.SS.Formula.Functions;
 using Shentun.Peis.Charges;
+using Shentun.Peis.CollectItemTypes;
 using Shentun.Peis.Enums;
 using Shentun.Peis.ItemTypes;
 using Shentun.Peis.Models;
@@ -47,6 +48,7 @@ namespace Shentun.Peis.ChargeReports
         private readonly IRepository _patientRepository;
         private readonly IRepository _sexRepository;
         private readonly ItemTypeManager _itemTypeManager;
+        private readonly IRepository _collectItemTypeRepository;
         public ChargeReportAppService(
             IRepository chargeRepository,
             IRepository chargeBackRepository,
@@ -62,10 +64,12 @@ namespace Shentun.Peis.ChargeReports
             IRepository customerOrgRegisterRepository,
             IRepository customerOrgRepository,
             IRepository itemTypeRepository,
-            ItemTypeManager itemTypeManager
-,
+            ItemTypeManager itemTypeManager,
             IRepository patientRepository,
-            IRepository sexRepository)
+            IRepository sexRepository
+,
+            IRepository collectItemTypeRepository
+            )
         {
             _chargeRepository = chargeRepository;
             _chargeBackRepository = chargeBackRepository;
@@ -84,6 +88,7 @@ namespace Shentun.Peis.ChargeReports
             _itemTypeManager = itemTypeManager;
             _patientRepository = patientRepository;
             _sexRepository = sexRepository;
+            _collectItemTypeRepository = collectItemTypeRepository;
         }
 
 
@@ -262,7 +267,7 @@ namespace Shentun.Peis.ChargeReports
                               join b in await _chargeAsbitemRepository.GetQueryableAsync() on a.Id equals b.ChargeId
                               join c in await _asbitemRepository.GetQueryableAsync() on b.AsbitemId equals c.Id into cc
                               from ac in cc.DefaultIfEmpty()
-                              join e in await _invoiceItemTypeRepository.GetQueryableAsync() on ac.InvoiceItemTypeId equals e.Id into ee
+                              join e in await _collectItemTypeRepository.GetQueryableAsync() on ac.CollectItemTypeId equals e.Id into ee
                               from ae in ee.DefaultIfEmpty()
                               join d in await _userRepository.GetQueryableAsync() on a.CreatorId equals d.Id into dd
                               from ad in dd.DefaultIfEmpty()
@@ -287,7 +292,7 @@ namespace Shentun.Peis.ChargeReports
             }
 
             //收费归总
-            var chargeDetails = chargeQuery.GroupBy(g => g.ac.InvoiceItemTypeId).Select(s => new GetTollCollectorFeeReportInInvoiceType_InvoiceTypeDetail
+            var chargeDetails = chargeQuery.GroupBy(g => g.ac.CollectItemTypeId).Select(s => new GetTollCollectorFeeReportInInvoiceType_InvoiceTypeDetail
             {
                 InvoiceTypeName = s.FirstOrDefault().InvoiceItemTypeName,
                 InvoiceTypeMoney = DataHelper.DecimalRetainDecimals(s.Sum(ss => ss.b.Amount * ss.b.ChargePrice), 2)
@@ -301,7 +306,7 @@ namespace Shentun.Peis.ChargeReports
                                   join c in await _chargeAsbitemRepository.GetQueryableAsync() on b.Id equals c.ChargeId
                                   join d in await _asbitemRepository.GetQueryableAsync() on c.AsbitemId equals d.Id into dd
                                   from ad in dd.DefaultIfEmpty()
-                                  join e in await _invoiceItemTypeRepository.GetQueryableAsync() on ad.InvoiceItemTypeId equals e.Id into ee
+                                  join e in await _collectItemTypeRepository.GetQueryableAsync() on ad.CollectItemTypeId equals e.Id into ee
                                   from ae in ee.DefaultIfEmpty()
                                   join f in await _userRepository.GetQueryableAsync() on a.CreatorId equals f.Id into ff
                                   from af in ff.DefaultIfEmpty()
@@ -326,7 +331,7 @@ namespace Shentun.Peis.ChargeReports
             }
 
             //收费归总
-            var chargeBackDetails = chargeBackQuery.GroupBy(g => g.ad.InvoiceItemTypeId).Select(s => new GetTollCollectorFeeReportInInvoiceType_InvoiceTypeDetail
+            var chargeBackDetails = chargeBackQuery.GroupBy(g => g.ad.CollectItemTypeId).Select(s => new GetTollCollectorFeeReportInInvoiceType_InvoiceTypeDetail
             {
                 InvoiceTypeName = s.FirstOrDefault().InvoiceItemTypeName,
                 InvoiceTypeMoney = DataHelper.DecimalRetainDecimals(s.Sum(ss => ss.c.Amount * ss.c.ChargePrice), 2)
diff --git a/src/Shentun.Peis.Application/DataMigrations/BaseDataHandleAppService.cs b/src/Shentun.Peis.Application/DataMigrations/BaseDataHandleAppService.cs
index eee3307..e3425c1 100644
--- a/src/Shentun.Peis.Application/DataMigrations/BaseDataHandleAppService.cs
+++ b/src/Shentun.Peis.Application/DataMigrations/BaseDataHandleAppService.cs
@@ -788,7 +788,7 @@ namespace Shentun.Peis.DataMigrations
                             DeviceTypeId = deviceTypeId,
                             ClinicalMeaning = row["clinical_meaning"].ToString(),
                             ForSexId = ConvertForSex(row["for_sex_id"].ToString()),
-                            InvoiceItemTypeId = InvoiceItemTypeId,
+                            //InvoiceItemTypeId = InvoiceItemTypeId,
                             IsBeforeEat = Convert.ToChar(row["before_eat_flag"].ToString()),
                             IsCheck = Convert.ToChar(row["check_flag"].ToString()),
                             IsItemResultMerger = Convert.ToChar(row["item_result_merger_flag"].ToString()),
diff --git a/src/Shentun.Peis.Application/MedicalPackageDetails/MedicalPackageDetailAppService.cs b/src/Shentun.Peis.Application/MedicalPackageDetails/MedicalPackageDetailAppService.cs
index a5c1933..722e5b1 100644
--- a/src/Shentun.Peis.Application/MedicalPackageDetails/MedicalPackageDetailAppService.cs
+++ b/src/Shentun.Peis.Application/MedicalPackageDetails/MedicalPackageDetailAppService.cs
@@ -128,7 +128,7 @@ namespace Shentun.Peis.MedicalPackageDetails
                 DisplayOrder = s.Asbitem.DisplayOrder,
                 ForSexId = s.Asbitem.ForSexId,
                 Id = s.Asbitem.Id,
-                InvoiceItemTypeId = s.Asbitem.InvoiceItemTypeId,
+                //InvoiceItemTypeId = s.Asbitem.InvoiceItemTypeId,
                 IsActive = s.Asbitem.IsActive,
                 IsBeforeEat = s.Asbitem.IsBeforeEat,
                 IsCheck = s.Asbitem.IsCheck,
diff --git a/src/Shentun.Peis.Application/SampleGroupDetails/SampleGroupDetailAppService.cs b/src/Shentun.Peis.Application/SampleGroupDetails/SampleGroupDetailAppService.cs
index 4d87bc6..6b1bed6 100644
--- a/src/Shentun.Peis.Application/SampleGroupDetails/SampleGroupDetailAppService.cs
+++ b/src/Shentun.Peis.Application/SampleGroupDetails/SampleGroupDetailAppService.cs
@@ -128,7 +128,7 @@ namespace Shentun.Peis.SampleGroupDetails
                 DisplayOrder = s.Asbitem.DisplayOrder,
                 ForSexId = s.Asbitem.ForSexId,
                 Id = s.Asbitem.Id,
-                InvoiceItemTypeId = s.Asbitem.InvoiceItemTypeId,
+                //InvoiceItemTypeId = s.Asbitem.InvoiceItemTypeId,
                 IsActive = s.Asbitem.IsActive,
                 IsBeforeEat = s.Asbitem.IsBeforeEat,
                 IsCheck = s.Asbitem.IsCheck,
diff --git a/src/Shentun.Peis.Domain/Asbitems/Asbitem.cs b/src/Shentun.Peis.Domain/Asbitems/Asbitem.cs
index 933cb26..b51a57e 100644
--- a/src/Shentun.Peis.Domain/Asbitems/Asbitem.cs
+++ b/src/Shentun.Peis.Domain/Asbitems/Asbitem.cs
@@ -1,4 +1,5 @@
 using Microsoft.EntityFrameworkCore;
+using Shentun.Peis.CollectItemTypes;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -59,10 +60,17 @@ namespace Shentun.Peis.Models
         [Column("device_type_id")]
         public Guid? DeviceTypeId { get; set; }
         /// 
-        /// 发票类别
+        ///// 发票类别
+        ///// 
+        //[Column("invoice_item_type_id")]
+        //public Guid InvoiceItemTypeId { get; set; }
+
+        /// 
+        /// 汇总项目类别ID
         /// 
-        [Column("invoice_item_type_id")]
-        public Guid InvoiceItemTypeId { get; set; }
+        [Column("collect_item_type_id")]
+        public Guid CollectItemTypeId { get; set; }
+
         /// 
         /// 项目结果合并
         /// 
@@ -139,9 +147,14 @@ namespace Shentun.Peis.Models
         public string ConcurrencyStamp { get; set; }
 
 
-        [ForeignKey(nameof(InvoiceItemTypeId))]
+        //[ForeignKey(nameof(InvoiceItemTypeId))]
+        //[InverseProperty("Asbitems")]
+        //public virtual InvoiceItemType InvoiceItemType { get; set; }
+
+        [ForeignKey(nameof(CollectItemTypeId))]
         [InverseProperty("Asbitems")]
-        public virtual InvoiceItemType InvoiceItemType { get; set; } = null!;
+        public virtual CollectItemType CollectItemType { get; set; }
+
         [ForeignKey(nameof(ItemTypeId))]
         [InverseProperty("Asbitems")]
         public virtual ItemType ItemType { get; set; } = null!;
@@ -165,6 +178,7 @@ namespace Shentun.Peis.Models
         [ForeignKey("AsbitemId")]
         [InverseProperty(nameof(Room.Asbitems))]
         public virtual ICollection Rooms { get; set; }
+ 
 
 
         #region 审计属性
diff --git a/src/Shentun.Peis.Domain/Asbitems/AsbitemEntity.cs b/src/Shentun.Peis.Domain/Asbitems/AsbitemEntity.cs
index 30b9d31..a4c021b 100644
--- a/src/Shentun.Peis.Domain/Asbitems/AsbitemEntity.cs
+++ b/src/Shentun.Peis.Domain/Asbitems/AsbitemEntity.cs
@@ -41,10 +41,10 @@ namespace Shentun.Peis.Asbitems
         public Guid? DeviceTypeId { get; set; }
 
 
-        /// 
-        /// 发票类别
-        /// 
-        public Guid InvoiceItemTypeId { get; set; }
+        ///// 
+        ///// 发票类别
+        ///// 
+        //public Guid InvoiceItemTypeId { get; set; }
 
 
         /// 
diff --git a/src/Shentun.Peis.Domain/Asbitems/AsbitemManager.cs b/src/Shentun.Peis.Domain/Asbitems/AsbitemManager.cs
index ced42e0..28a4e5f 100644
--- a/src/Shentun.Peis.Domain/Asbitems/AsbitemManager.cs
+++ b/src/Shentun.Peis.Domain/Asbitems/AsbitemManager.cs
@@ -87,7 +87,8 @@ namespace Shentun.Peis.Asbitems
                 DeviceTypeId = entity.DeviceTypeId,
                 DiagnosisFunction = entity.DiagnosisFunction,
                 ForSexId = entity.ForSexId,
-                InvoiceItemTypeId = entity.InvoiceItemTypeId,
+                //InvoiceItemTypeId = entity.InvoiceItemTypeId,
+                CollectItemTypeId = entity.CollectItemTypeId,
                 IsActive = entity.IsActive,
                 IsBeforeEat = entity.IsBeforeEat,
                 IsCheck = entity.IsCheck,
@@ -127,7 +128,7 @@ namespace Shentun.Peis.Asbitems
             targetEntity.DeviceTypeId = sourceEntity.DeviceTypeId;
             targetEntity.DiagnosisFunction = sourceEntity.DiagnosisFunction;
             targetEntity.ForSexId = sourceEntity.ForSexId;
-            targetEntity.InvoiceItemTypeId = sourceEntity.InvoiceItemTypeId;
+            targetEntity.CollectItemTypeId = sourceEntity.CollectItemTypeId;
             targetEntity.IsActive = sourceEntity.IsActive;
             targetEntity.IsBeforeEat = sourceEntity.IsBeforeEat;
             targetEntity.IsCheck = sourceEntity.IsCheck;
@@ -154,9 +155,9 @@ namespace Shentun.Peis.Asbitems
             DataHelper.CheckEntityIsNull(entity);
             DataHelper.CheckStringIsNull(entity.DisplayName, "名称");
             DataHelper.CheckForSex(entity.ForSexId);
-           
+
             DataHelper.CheckGuidIsDefaultValue(entity.ItemTypeId, "项目类别");
-            DataHelper.CheckGuidIsDefaultValue(entity.InvoiceItemTypeId, "发票类别");
+            DataHelper.CheckGuidIsDefaultValue(entity.CollectItemTypeId, "汇总项目类别");
             DataHelper.CheckCharIsYOrN(entity.IsItemResultMerger, "是否合并项目结果");
             DataHelper.CheckCharIsYOrN(entity.IsBeforeEat, "是否餐前项目");
             DataHelper.CheckCharIsYOrN(entity.IsDiagnosisFunction, "是否启用诊断函数");
diff --git a/src/Shentun.Peis.Domain/CollectItemTypes/CollectItemType.cs b/src/Shentun.Peis.Domain/CollectItemTypes/CollectItemType.cs
new file mode 100644
index 0000000..814dc7f
--- /dev/null
+++ b/src/Shentun.Peis.Domain/CollectItemTypes/CollectItemType.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.Domain.Entities.Auditing;
+using Volo.Abp.Domain.Entities;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+using Shentun.Peis.Models;
+
+namespace Shentun.Peis.CollectItemTypes
+{
+    /// 
+    /// 汇总项目类别
+    /// 
+    [Table("collect_item_type")]
+    public class CollectItemType : AuditedEntity, IDisplayName, IDisplayOrder, IHasConcurrencyStamp
+    {
+
+        public CollectItemType(Guid id) : base(id)
+        {
+
+        }
+
+        public CollectItemType()
+        {
+            Asbitems = new HashSet();
+        }
+
+        /// 
+        /// 名称
+        /// 
+        [Column("display_name")]
+        [StringLength(50)]
+        public string DisplayName { get; set; }
+
+        [Column("simple_code")]
+        [StringLength(50)]
+        public string SimpleCode { get; set; }
+
+
+        [Column("display_order")]
+        public int DisplayOrder { get; set; }
+
+        /// 
+        /// 发票项目类别ID
+        /// 
+        [Column("invoice_item_type_id")]
+        public Guid InvoiceItemTypeId { get; set; }
+
+
+        [Column("concurrency_stamp")]
+        public string ConcurrencyStamp { get; set; }
+
+        [ForeignKey(nameof(InvoiceItemTypeId))]
+        public virtual InvoiceItemType InvoiceItemType { get; set; }
+
+
+        [InverseProperty(nameof(Asbitem.CollectItemType))]
+        public virtual ICollection Asbitems { get; set; }
+    }
+}
diff --git a/src/Shentun.Peis.Domain/InvoiceItemTypes/InvoiceItemType.cs b/src/Shentun.Peis.Domain/InvoiceItemTypes/InvoiceItemType.cs
index 316388c..3d34914 100644
--- a/src/Shentun.Peis.Domain/InvoiceItemTypes/InvoiceItemType.cs
+++ b/src/Shentun.Peis.Domain/InvoiceItemTypes/InvoiceItemType.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using Microsoft.EntityFrameworkCore;
+using Shentun.Peis.CollectItemTypes;
 using Volo.Abp.Domain.Entities;
 using Volo.Abp.Domain.Entities.Auditing;
 
@@ -17,8 +18,8 @@ namespace Shentun.Peis.Models
     {
         public InvoiceItemType()
         {
-            Asbitems = new HashSet();
             PriceItems = new HashSet();
+            CollectItemTypes = new HashSet();
         }
 
         /// 
@@ -47,11 +48,15 @@ namespace Shentun.Peis.Models
         [Column("concurrency_stamp")]
         public string ConcurrencyStamp { get; set; }
 
-        [InverseProperty(nameof(Asbitem.InvoiceItemType))]
-        public virtual ICollection Asbitems { get; set; }
+        //[InverseProperty(nameof(Asbitem.InvoiceItemType))]
+        //public virtual ICollection Asbitems { get; set; }
         [InverseProperty(nameof(PriceItem.InvoiceItemType))]
         public virtual ICollection PriceItems { get; set; }
 
+
+        [InverseProperty(nameof(CollectItemType.InvoiceItemType))]
+        public virtual ICollection CollectItemTypes { get; set; }
+
         //public override object[] GetKeys()
         //{
         //    return new object[] { InvoiceItemTypeId };
diff --git a/src/Shentun.Peis.Domain/InvoiceItemTypes/InvoiceItemTypeManager.cs b/src/Shentun.Peis.Domain/InvoiceItemTypes/InvoiceItemTypeManager.cs
index af1fe0f..e493174 100644
--- a/src/Shentun.Peis.Domain/InvoiceItemTypes/InvoiceItemTypeManager.cs
+++ b/src/Shentun.Peis.Domain/InvoiceItemTypes/InvoiceItemTypeManager.cs
@@ -1,4 +1,5 @@
-using Shentun.Peis.HelperDto;
+using Shentun.Peis.CollectItemTypes;
+using Shentun.Peis.HelperDto;
 using Shentun.Peis.Models;
 using Shentun.Utilities;
 using System;
@@ -20,14 +21,17 @@ namespace Shentun.Peis.InvoiceItemTypes
     {
         private readonly IRepository _repository;
         private readonly IRepository _asbitemRepository;
+        private readonly IRepository _collectItemTypeRepository;
 
         public InvoiceItemTypeManager(
             IRepository repository,
             IRepository asbitemRepository
-            )
+,
+            IRepository collectItemTypeRepository)
         {
             this._repository = repository;
             this._asbitemRepository = asbitemRepository;
+            _collectItemTypeRepository = collectItemTypeRepository;
         }
         /// 
         /// 创建
@@ -109,11 +113,11 @@ namespace Shentun.Peis.InvoiceItemTypes
         /// 
         public async Task CheckAndDeleteAsync(InvoiceItemType entity)
         {
-            var queryable = await _asbitemRepository.GetQueryableAsync();
+            var queryable = await _collectItemTypeRepository.GetQueryableAsync();
             var item = queryable.Where(o => o.InvoiceItemTypeId.Equals(entity.Id)).FirstOrDefault();
             if (item != null)
             {
-                throw new BusinessException("", $"发票项目类别\"{entity.DisplayName}\"已在组合项目\"{item.DisplayName}\"中使用,不能删除");
+                throw new BusinessException("", $"发票项目类别\"{entity.DisplayName}\"已在汇总项目\"{item.DisplayName}\"中使用,不能删除");
             }
             await _repository.DeleteAsync(entity);
 
diff --git a/src/Shentun.Peis.EntityFrameworkCore/CustomerOrgGroupDetails/CustomerOrgGroupDetailRepository.cs b/src/Shentun.Peis.EntityFrameworkCore/CustomerOrgGroupDetails/CustomerOrgGroupDetailRepository.cs
index 416bb0c..b79a224 100644
--- a/src/Shentun.Peis.EntityFrameworkCore/CustomerOrgGroupDetails/CustomerOrgGroupDetailRepository.cs
+++ b/src/Shentun.Peis.EntityFrameworkCore/CustomerOrgGroupDetails/CustomerOrgGroupDetailRepository.cs
@@ -61,7 +61,7 @@ namespace Shentun.Peis.CustomerOrgGroupDetails
                             DisplayName = b.DisplayName,
                             DisplayOrder = b.DisplayOrder,
                             ForSexId = b.ForSexId,
-                            InvoiceItemTypeId = b.InvoiceItemTypeId,
+                            //InvoiceItemTypeId = b.InvoiceItemTypeId,
                             IsActive = b.IsActive,
                             IsBeforeEat = b.IsBeforeEat,
                             IsCheck = b.IsCheck,
diff --git a/src/Shentun.Peis.EntityFrameworkCore/DbMapping/Asbitems/AsbitemDbMapping.cs b/src/Shentun.Peis.EntityFrameworkCore/DbMapping/Asbitems/AsbitemDbMapping.cs
index 47eea5e..72d31c5 100644
--- a/src/Shentun.Peis.EntityFrameworkCore/DbMapping/Asbitems/AsbitemDbMapping.cs
+++ b/src/Shentun.Peis.EntityFrameworkCore/DbMapping/Asbitems/AsbitemDbMapping.cs
@@ -22,7 +22,7 @@ namespace Shentun.Peis.DbMapping
             entity.Property(t => t.ItemTypeId).HasComment("项目类别").IsRequired().IsFixedLength();
             entity.Property(t => t.Price).HasComment("价格").IsRequired().HasDefaultValueSql("0");
             entity.Property(t => t.DeviceTypeId).HasComment("仪器类别");
-            entity.Property(t => t.InvoiceItemTypeId).HasComment("发票类别").IsRequired().IsFixedLength();
+            entity.Property(t => t.CollectItemTypeId).HasComment("汇总项目类别").IsRequired().IsFixedLength();
             entity.Property(t => t.IsItemResultMerger).HasComment("项目结果合并").IsRequired().HasDefaultValueSql("'N'");
             entity.Property(t => t.IsBeforeEat).HasComment("餐前项目").IsRequired().HasDefaultValueSql("'N'");
             entity.Property(t => t.ClinicalMeaning).HasComment("临床意义");
@@ -40,11 +40,11 @@ namespace Shentun.Peis.DbMapping
                 .IsFixedLength()
                 .HasComment("编号").HasColumnName("id");
 
-            entity.HasOne(d => d.InvoiceItemType)
+            entity.HasOne(d => d.CollectItemType)
                 .WithMany(p => p.Asbitems)
-                .HasForeignKey(d => d.InvoiceItemTypeId)
+                .HasForeignKey(d => d.CollectItemTypeId)
                 .OnDelete(DeleteBehavior.ClientSetNull)
-                .HasConstraintName("fk_asbitem_invoice_item_type");
+                .HasConstraintName("fk_asbitem_collect_item_type");
 
             entity.HasOne(d => d.ItemType)
                 .WithMany(p => p.Asbitems)
diff --git a/src/Shentun.Peis.EntityFrameworkCore/Migrations/20240502112155_init20240502001.Designer.cs b/src/Shentun.Peis.EntityFrameworkCore/Migrations/20240502112155_init20240502001.Designer.cs
new file mode 100644
index 0000000..19fe9f2
--- /dev/null
+++ b/src/Shentun.Peis.EntityFrameworkCore/Migrations/20240502112155_init20240502001.Designer.cs
@@ -0,0 +1,14136 @@
+// 
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Shentun.Peis.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+
+#nullable disable
+
+namespace Shentun.Peis.Migrations
+{
+    [DbContext(typeof(PeisDbContext))]
+    [Migration("20240502112155_init20240502001")]
+    partial class init20240502001
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
+                .HasAnnotation("ProductVersion", "6.0.5")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("AsbitemRoom", b =>
+                {
+                    b.Property("AsbitemId")
+                        .HasColumnType("uuid");
+
+                    b.Property("RoomId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("AsbitemId", "RoomId");
+
+                    b.ToTable("AsbitemRoom");
+                });
+
+            modelBuilder.Entity("RoomAsbitem", b =>
+                {
+                    b.Property("RoomId")
+                        .HasMaxLength(5)
+                        .HasColumnType("uuid")
+                        .HasColumnName("room_id")
+                        .IsFixedLength();
+
+                    b.Property("AsbitemId")
+                        .HasMaxLength(6)
+                        .HasColumnType("uuid")
+                        .HasColumnName("asbitem_id")
+                        .IsFixedLength();
+
+                    b.HasKey("RoomId", "AsbitemId")
+                        .HasName("pk_room_asbitem");
+
+                    b.HasIndex("AsbitemId");
+
+                    b.ToTable("room_asbitem", (string)null);
+
+                    b.HasComment("房间包含组合项目设置");
+                });
+
+            modelBuilder.Entity("Shentun.Peis.Books.HelloA", b =>
+                {
+                    b.Property("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property("ADesc")
+                        .HasColumnType("text")
+                        .HasColumnName("a_desc");
+
+                    b.Property("AName")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text")
+                        .HasDefaultValue("默认值")
+                        .HasColumnName("a_name");
+
+                    b.Property("AddTime")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("add_time")
+                        .HasDefaultValueSql("now()");
+
+                    b.Property("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("creation_time");
+
+                    b.Property("CreatorId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("creator_id");
+
+                    b.Property("HelloTypeId")
+                        .HasColumnType("text")
+                        .HasColumnName("hello_type_id");
+
+                    b.Property("LastModificationTime")
+                        .IsRequired()
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("last_modification_time");
+
+                    b.Property("LastModifierId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_modifier_id");
+
+                    b.Property("S2")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("character(1)")
+                        .HasDefaultValueSql("'A'::bpchar");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex(new[] { "AName" }, "ix_helloa")
+                        .IsUnique();
+
+                    b.ToTable("hello_a");
+                });
+
+            modelBuilder.Entity("Shentun.Peis.Books.HelloType", b =>
+                {
+                    b.Property("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("creation_time");
+
+                    b.Property("CreatorId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("creator_id");
+
+                    b.Property("LastModificationTime")
+                        .IsRequired()
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("last_modification_time");
+
+                    b.Property("LastModifierId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_modifier_id");
+
+                    b.Property("TypeName")
+                        .HasMaxLength(10)
+                        .HasColumnType("character varying(10)")
+                        .HasColumnName("type_name")
+                        .HasComment("类型名称");
+
+                    b.Property("s1")
+                        .HasColumnType("uuid")
+                        .HasColumnName("s1");
+
+                    b.Property("s2")
+                        .HasColumnType("uuid")
+                        .HasColumnName("s2");
+
+                    b.Property("s3")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("s3");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("hello_type");
+                });
+
+            modelBuilder.Entity("Shentun.Peis.Books.Ma", b =>
+                {
+                    b.Property("Id")
+                        .HasColumnType("text")
+                        .HasColumnName("id");
+
+                    b.Property("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("creation_time");
+
+                    b.Property("CreatorId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("creator_id");
+
+                    b.Property("LastModificationTime")
+                        .IsRequired()
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("last_modification_time");
+
+                    b.Property("LastModifierId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_modifier_id");
+
+                    b.Property("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ma");
+                });
+
+            modelBuilder.Entity("Shentun.Peis.Books.Mb", b =>
+                {
+                    b.Property("Id")
+                        .HasColumnType("text")
+                        .HasColumnName("id");
+
+                    b.Property("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("creation_time");
+
+                    b.Property("CreatorId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("creator_id");
+
+                    b.Property("LastModificationTime")
+                        .IsRequired()
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("last_modification_time");
+
+                    b.Property("LastModifierId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_modifier_id");
+
+                    b.Property("MaId")
+                        .HasColumnType("text")
+                        .HasColumnName("ma_id");
+
+                    b.Property("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("MaId");
+
+                    b.ToTable("mb");
+                });
+
+            modelBuilder.Entity("Shentun.Peis.Books.Mc", b =>
+                {
+                    b.Property("Id")
+                        .HasColumnType("text")
+                        .HasColumnName("id");
+
+                    b.Property("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("creation_time");
+
+                    b.Property("CreatorId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("creator_id");
+
+                    b.Property("LastModificationTime")
+                        .IsRequired()
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("last_modification_time");
+
+                    b.Property("LastModifierId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_modifier_id");
+
+                    b.Property("MbId")
+                        .HasColumnType("text")
+                        .HasColumnName("mb_id");
+
+                    b.Property("Name")
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("MbId");
+
+                    b.ToTable("mc");
+                });
+
+            modelBuilder.Entity("Shentun.Peis.Books.Student", b =>
+                {
+                    b.Property("Sid")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("sid");
+
+                    b.Property("Cid")
+                        .HasColumnType("text");
+
+                    b.Property("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property("Name")
+                        .HasColumnType("text");
+
+                    b.Property("Uid")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Sid");
+
+                    b.ToTable("student");
+                });
+
+            modelBuilder.Entity("Shentun.Peis.Books.TestA", b =>
+                {
+                    b.Property("AId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .IsFixedLength()
+                        .HasComment("编号");
+
+                    b.Property("AName")
+                        .HasColumnType("text");
+
+                    b.HasKey("AId");
+
+                    b.ToTable("testa");
+
+                    b.HasComment("组合项目");
+                });
+
+            modelBuilder.Entity("Shentun.Peis.Books.TestB", b =>
+                {
+                    b.Property("BId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property("AId")
+                        .HasColumnType("uuid")
+                        .IsFixedLength()
+                        .HasComment("编号");
+
+                    b.Property("AName")
+                        .HasColumnType("text");
+
+                    b.Property("TestAsAId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("BId");
+
+                    b.HasIndex("TestAsAId");
+
+                    b.ToTable("testb");
+
+                    b.HasComment("组合项目");
+                });
+
+            modelBuilder.Entity("Shentun.Peis.Books.TestCT", b =>
+                {
+                    b.Property("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("concurrency_stamp");
+
+                    b.Property("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("creation_time");
+
+                    b.Property("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("creator_id");
+
+                    b.Property("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("last_modification_time");
+
+                    b.Property("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_modifier_id");
+
+                    b.Property("TName")
+                        .HasColumnType("text")
+                        .HasColumnName("t_name");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("test_ct");
+                });
+
+            modelBuilder.Entity("Shentun.Peis.CollectItemTypes.CollectItemType", b =>
+                {
+                    b.Property("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property("DisplayName")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("display_name");
+
+                    b.Property("DisplayOrder")
+                        .HasColumnType("integer")
+                        .HasColumnName("display_order");
+
+                    b.Property("InvoiceItemTypeId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("invoice_item_type_id");
+
+                    b.Property("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property("SimpleCode")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("simple_code");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("InvoiceItemTypeId");
+
+                    b.ToTable("collect_item_type");
+                });
+
+            modelBuilder.Entity("Shentun.Peis.Models.AbpUserDepartment", b =>
+                {
+                    b.Property("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property("OrganizationUnitId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("organization_unit_id");
+
+                    b.Property("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("concurrency_stamp");
+
+                    b.Property("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("creation_time");
+
+                    b.Property("CreatorId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("creator_id");
+
+                    b.Property("LastModificationTime")
+                        .IsRequired()
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("last_modification_time");
+
+                    b.Property("LastModifierId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_modifier_id");
+
+                    b.HasKey("UserId", "OrganizationUnitId")
+                        .HasName("pk_user_organizationunitid");
+
+                    b.ToTable("abp_user_department");
+                });
+
+            modelBuilder.Entity("Shentun.Peis.Models.Asbitem", b =>
+                {
+                    b.Property("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id")
+                        .IsFixedLength()
+                        .HasComment("编号");
+
+                    b.Property("ClinicalMeaning")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)")
+                        .HasColumnName("clinical_meaning")
+                        .HasComment("临床意义");
+
+                    b.Property("CollectItemTypeId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("collect_item_type_id")
+                        .IsFixedLength()
+                        .HasComment("汇总项目类别");
+
+                    b.Property("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("concurrency_stamp");
+
+                    b.Property("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("creation_time");
+
+                    b.Property("CreatorId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("creator_id");
+
+                    b.Property("DefaultResult")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)")
+                        .HasColumnName("default_result")
+                        .HasComment("默认结果");
+
+                    b.Property("DeviceTypeId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("device_type_id")
+                        .HasComment("仪器类别");
+
+                    b.Property("DiagnosisFunction")
+                        .HasMaxLength(4000)
+                        .HasColumnType("character varying(4000)")
+                        .HasColumnName("diagnosis_function")
+                        .HasComment("诊断函数");
+
+                    b.Property("DisplayName")
+                        .IsRequired()
+                        .HasMaxLength(30)
+                        .HasColumnType("character varying(30)")
+                        .HasColumnName("display_name")
+                        .HasComment("名称");
+
+                    b.Property("DisplayOrder")
+                        .HasColumnType("integer")
+                        .HasColumnName("display_order");
+
+                    b.Property("ForSexId")
+                        .ValueGeneratedOnAdd()
+                        .HasMaxLength(1)
+                        .HasColumnType("character(1)")
+                        .HasColumnName("for_sex_id")
+                        .HasDefaultValueSql("'A'")
+                        .HasComment("适用性别,M-男,F-女,A-全部");
+
+                    b.Property("IsActive")
+                        .ValueGeneratedOnAdd()
+                        .HasMaxLength(1)
+                        .HasColumnType("character(1)")
+                        .HasColumnName("is_active")
+                        .HasDefaultValueSql("'Y'")
+                        .HasComment("是启用");
+
+                    b.Property("IsBeforeEat")
+                        .ValueGeneratedOnAdd()
+                        .HasMaxLength(1)
+                        .HasColumnType("character(1)")
+                        .HasColumnName("is_before_eat")
+                        .HasDefaultValueSql("'N'")
+                        .HasComment("餐前项目");
+
+                    b.Property("IsCheck")
+                        .ValueGeneratedOnAdd()
+                        .HasMaxLength(1)
+                        .HasColumnType("character(1)")
+                        .HasColumnName("is_check")
+                        .HasDefaultValueSql("'Y'")
+                        .HasComment("是检查项目");
+
+                    b.Property("IsContinueProcess")
+                        .ValueGeneratedOnAdd()
+                        .HasMaxLength(1)
+                        .HasColumnType("character(1)")
+                        .HasColumnName("is_continue_process")
+                        .HasDefaultValueSql("'N'")
+                        .HasComment("诊断函数处理完毕后继续处理");
+
+                    b.Property("IsDiagnosisFunction")
+                        .ValueGeneratedOnAdd()
+                        .HasMaxLength(1)
+                        .HasColumnType("character(1)")
+                        .HasColumnName("is_diagnosis_function")
+                        .HasDefaultValueSql("'N'")
+                        .HasComment("启用诊断函数");
+
+                    b.Property("IsItemResultMerger")
+                        .ValueGeneratedOnAdd()
+                        .HasMaxLength(1)
+                        .HasColumnType("character(1)")
+                        .HasColumnName("is_item_result_merger")
+                        .HasDefaultValueSql("'N'")
+                        .HasComment("项目结果合并");
+
+                    b.Property("IsPictureRotate")
+                        .ValueGeneratedOnAdd()
+                        .HasMaxLength(1)
+                        .HasColumnType("character(1)")
+                        .HasColumnName("is_picture_rotate")
+                        .HasDefaultValueSql("'N'")
+                        .HasComment("体检报告图片旋转90°");
+
+                    b.Property("ItemTypeId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("item_type_id")
+                        .IsFixedLength()
+                        .HasComment("项目类别");
+
+                    b.Property("LastModificationTime")
+                        .IsRequired()
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("last_modification_time");
+
+                    b.Property("LastModifierId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_modifier_id");
+
+                    b.Property("Price")
+                        .ValueGeneratedOnAdd()
+                        .HasPrecision(8, 2)
+                        .HasColumnType("numeric(8,2)")
+                        .HasColumnName("price")
+                        .HasDefaultValueSql("0")
+                        .HasComment("价格");
+
+                    b.Property("QueueTime")
+                        .ValueGeneratedOnAdd()
+                        .HasPrecision(3, 1)
+                        .HasColumnType("numeric(3,1)")
+                        .HasColumnName("queue_time")
+                        .HasDefaultValueSql("0")
+                        .HasComment("候诊时间");
+
+                    b.Property("ShortName")
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)")
+                        .HasColumnName("short_name")
+                        .HasComment("简称");
+
+                    b.Property("SimpleCode")
+                        .HasMaxLength(30)
+                        .HasColumnType("character varying(30)")
+                        .HasColumnName("simple_code");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ItemTypeId");
+
+                    b.HasIndex(new[] { "DisplayName" }, "ix_asbitem")
+                        .IsUnique();
+
+                    b.ToTable("asbitem");
+
+                    b.HasComment("组合项目");
+                });
+
+            modelBuilder.Entity("Shentun.Peis.Models.AsbitemDetail", b =>
+                {
+                    b.Property("AsbitemId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("asbitem_id")
+                        .IsFixedLength();
+
+                    b.Property("ItemId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("item_id")
+                        .IsFixedLength()
+                        .HasComment("项目编码");
+
+                    b.Property("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("concurrency_stamp");
+
+                    b.HasKey("AsbitemId", "ItemId")
+                        .HasName("pk_department_asbitem_detail");
+
+                    b.HasIndex("ItemId");
+
+                    b.ToTable("asbitem_detail");
+
+                    b.HasComment("组合项目包含项目");
+                });
+
+            modelBuilder.Entity("Shentun.Peis.Models.AsbitemGuide", b =>
+                {
+                    b.Property("OrganizationUnitId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("organization_unit_id")
+                        .IsFixedLength()
+                        .HasComment("单位科室ID");
+
+                    b.Property("AsbitemId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("asbitem_id")
+                        .IsFixedLength()
+                        .HasComment("组合项目ID");
+
+                    b.Property("ForSexId")
+                        .ValueGeneratedOnAdd()
+                        .HasMaxLength(1)
+                        .HasColumnType("character(1)")
+                        .HasColumnName("for_sex_id")
+                        .HasDefaultValueSql("'A'")
+                        .HasComment("适用性别ID");
+
+                    b.Property("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("concurrency_stamp");
+
+                    b.Property("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("creation_time");
+
+                    b.Property("CreatorId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("creator_id");
+
+                    b.Property("Guide")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("guide")
+                        .HasComment("指引单内容");
+
+                    b.Property("LastModificationTime")
+                        .IsRequired()
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("last_modification_time");
+
+                    b.Property("LastModifierId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_modifier_id");
+
+                    b.HasKey("OrganizationUnitId", "AsbitemId", "ForSexId")
+                        .HasName("pk_department_asbitem_guide");
+
+                    b.ToTable("asbitem_guide");
+
+                    b.HasComment("体检中心组和项目指引内容");
+                });
+
+            modelBuilder.Entity("Shentun.Peis.Models.AsbitemPriceItem", b =>
+                {
+                    b.Property("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id")
+                        .IsFixedLength();
+
+                    b.Property("Amount")
+                        .IsRequired()
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("smallint")
+                        .HasColumnName("amount")
+                        .HasDefaultValueSql("0")
+                        .HasComment("数量");
+
+                    b.Property("AsbitemId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("asbitem_id")
+                        .IsFixedLength()
+                        .HasComment("组合项目编号");
+
+                    b.Property("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("concurrency_stamp");
+
+                    b.Property("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("creation_time");
+
+                    b.Property("CreatorId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("creator_id");
+
+                    b.Property("LastModificationTime")
+                        .IsRequired()
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("last_modification_time");
+
+                    b.Property("LastModifierId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_modifier_id");
+
+                    b.Property("PriceItemId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("price_item_id")
+                        .IsFixedLength()
+                        .HasComment("价表项目编码");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("asbitem_price_item");
+
+                    b.HasComment("组和项目包含价表项目");
+                });
+
+            modelBuilder.Entity("Shentun.Peis.Models.BigtextResultConclusion", b =>
+                {
+                    b.Property("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id")
+                        .IsFixedLength();
+
+                    b.Property("BigtextResultTemplateId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("bigtext_result_template_id")
+                        .IsFixedLength();
+
+                    b.Property("Conclusion")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("conclusion")
+                        .HasComment("结论");
+
+                    b.Property("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("concurrency_stamp");
+
+                    b.Property("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("creation_time");
+
+                    b.Property("CreatorId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("creator_id");
+
+                    b.Property("DisplayOrder")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("display_order")
+                        .HasDefaultValueSql("999999");
+
+                    b.Property("LastModificationTime")
+                        .IsRequired()
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("last_modification_time");
+
+                    b.Property("LastModifierId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_modifier_id");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BigtextResultTemplateId");
+
+                    b.ToTable("bigtext_result_conclusion");
+
+                    b.HasComment("大文本结果结论");
+                });
+
+            modelBuilder.Entity("Shentun.Peis.Models.BigtextResultDescription", b =>
+                {
+                    b.Property("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id")
+                        .IsFixedLength();
+
+                    b.Property("BigtextResultTemplateId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("bigtext_result_template_id")
+                        .IsFixedLength();
+
+                    b.Property("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("concurrency_stamp");
+
+                    b.Property("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("creation_time");
+
+                    b.Property("CreatorId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("creator_id");
+
+                    b.Property("Description")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)")
+                        .HasColumnName("description")
+                        .HasComment("描述");
+
+                    b.Property("DisplayOrder")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("display_order")
+                        .HasDefaultValueSql("999999");
+
+                    b.Property("LastModificationTime")
+                        .IsRequired()
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("last_modification_time");
+
+                    b.Property("LastModifierId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_modifier_id");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BigtextResultTemplateId");
+
+                    b.ToTable("bigtext_result_description");
+
+                    b.HasComment("大文本结果描述");
+                });
+
+            modelBuilder.Entity("Shentun.Peis.Models.BigtextResultTemplate", b =>
+                {
+                    b.Property("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id")
+                        .IsFixedLength();
+
+                    b.Property("BigtextResultTypeId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("bigtext_result_type_id")
+                        .IsFixedLength()
+                        .HasComment("结果类别编号");
+
+                    b.Property("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("concurrency_stamp");
+
+                    b.Property("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("creation_time");
+
+                    b.Property("CreatorId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("creator_id");
+
+                    b.Property("DisplayName")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("display_name")
+                        .HasComment("名称");
+
+                    b.Property("DisplayOrder")
+                        .HasColumnType("integer")
+                        .HasColumnName("display_order");
+
+                    b.Property("LastModificationTime")
+                        .IsRequired()
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("last_modification_time");
+
+                    b.Property("LastModifierId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_modifier_id");
+
+                    b.Property("SimpleCode")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("simple_code");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BigtextResultTypeId");
+
+                    b.ToTable("bigtext_result_template");
+
+                    b.HasComment("大文本结果模板");
+                });
+
+            modelBuilder.Entity("Shentun.Peis.Models.BigtextResultType", b =>
+                {
+                    b.Property("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id")
+                        .IsFixedLength();
+
+                    b.Property("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("concurrency_stamp");
+
+                    b.Property("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("creation_time");
+
+                    b.Property("CreatorId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("creator_id");
+
+                    b.Property("DisplayName")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)")
+                        .HasColumnName("display_name")
+                        .HasComment("名称");
+
+                    b.Property("DisplayOrder")
+                        .HasColumnType("integer")
+                        .HasColumnName("display_order");
+
+                    b.Property("ItemTypeId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("item_type_id")
+                        .IsFixedLength()
+                        .HasComment("项目类别");
+
+                    b.Property("LastModificationTime")
+                        .IsRequired()
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("last_modification_time");
+
+                    b.Property("LastModifierId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_modifier_id");
+
+                    b.Property("ParentId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("parent_id")
+                        .IsFixedLength()
+                        .HasComment("父编号");
+
+                    b.Property("PathCode")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("path_code")
+                        .HasComment("路径编码");
+
+                    b.Property("SimpleCode")
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)")
+                        .HasColumnName("simple_code");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ItemTypeId");
+
+                    b.ToTable("bigtext_result_type");
+
+                    b.HasComment("大文本结果类别");
+                });
+
+            modelBuilder.Entity("Shentun.Peis.Models.BirthPlace", b =>
+                {
+                    b.Property("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id")
+                        .IsFixedLength();
+
+                    b.Property("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("concurrency_stamp");
+
+                    b.Property("CountryCode")
+                        .IsRequired()
+                        .HasMaxLength(6)
+                        .HasColumnType("character varying(6)")
+                        .HasColumnName("country_code")
+                        .HasComment("国家标准码");
+
+                    b.Property("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("creation_time");
+
+                    b.Property("CreatorId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("creator_id");
+
+                    b.Property("DisplayName")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("display_name");
+
+                    b.Property("DisplayOrder")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("display_order")
+                        .HasDefaultValueSql("999999");
+
+                    b.Property("LastModificationTime")
+                        .IsRequired()
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("last_modification_time");
+
+                    b.Property("LastModifierId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_modifier_id");
+
+                    b.Property("SimpleCode")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("simple_code");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex(new[] { "DisplayName" }, "ix_birth_place")
+                        .IsUnique();
+
+                    b.ToTable("birth_place");
+
+                    b.HasComment("出生地");
+                });
+
+            modelBuilder.Entity("Shentun.Peis.Models.CardBill", b =>
+                {
+                    b.Property("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id")
+                        .HasComment("编号");
+
+                    b.Property("BillFlag")
+                        .ValueGeneratedOnAdd()
+                        .HasMaxLength(1)
+                        .HasColumnType("character(1)")
+                        .HasColumnName("bill_flag")
+                        .HasDefaultValueSql("'0'::bpchar")
+                        .HasComment("记账标志");
+
+                    b.Property("BillMoney")
+                        .HasPrecision(10, 2)
+                        .HasColumnType("numeric(10,2)")
+                        .HasColumnName("bill_money")
+                        .HasComment("记账金额");
+
+                    b.Property("CardRegisterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("card_register_id")
+                        .HasComment("卡登记编号");
+
+                    b.Property("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("concurrency_stamp");
+
+                    b.Property("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("creation_time");
+
+                    b.Property("CreatorId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("creator_id");
+
+                    b.Property("LastModificationTime")
+                        .IsRequired()
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("last_modification_time");
+
+                    b.Property("LastModifierId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_modifier_id");
+
+                    b.Property("PayModeId")
+                        .IsRequired()
+                        .HasMaxLength(4)
+                        .HasColumnType("character varying(4)")
+                        .HasColumnName("pay_mode_id")
+                        .HasComment("支付方式");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CardRegisterId");
+
+                    b.HasIndex("PayModeId");
+
+                    b.ToTable("card_bill");
+
+                    b.HasComment("卡记账记录");
+                });
+
+            modelBuilder.Entity("Shentun.Peis.Models.CardRegister", b =>
+                {
+                    b.Property("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id")
+                        .HasComment("编号");
+
+                    b.Property("CardBalance")
+                        .HasPrecision(10, 2)
+                        .HasColumnType("numeric(10,2)")
+                        .HasColumnName("card_balance");
+
+                    b.Property("CardNo")
+                        .IsRequired()
+                        .HasMaxLength(30)
+                        .HasColumnType("character varying(30)")
+                        .HasColumnName("card_no")
+                        .HasComment("卡号");
+
+                    b.Property("CardPassword")
+                        .HasMaxLength(10)
+                        .HasColumnType("character varying(10)")
+                        .HasColumnName("card_password");
+
+                    b.Property("CardTypeId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("card_type_id")
+                        .IsFixedLength()
+                        .HasComment("卡类型");
+
+                    b.Property("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("concurrency_stamp");
+
+                    b.Property("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("creation_time");
+
+                    b.Property("CreatorId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("creator_id");
+
+                    b.Property("CustomerName")
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)")
+                        .HasColumnName("customer_name")
+                        .HasComment("领用者");
+
+                    b.Property("Discount")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("discount")
+                        .HasDefaultValueSql("100")
+                        .HasComment("折扣");
+
+                    b.Property("ExpiryDate")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("expiry_date")
+                        .HasComment("有效期");
+
+                    b.Property("IdNo")
+                        .IsRequired()
+                        .HasMaxLength(18)
+                        .HasColumnType("character varying(18)")
+                        .HasColumnName("id_no")
+                        .HasComment("身份证号");
+
+                    b.Property("IsActive")
+                        .ValueGeneratedOnAdd()
+                        .HasMaxLength(1)
+                        .HasColumnType("character(1)")
+                        .HasColumnName("is_active")
+                        .HasDefaultValueSql("0")
+                        .HasComment("使用标志");
+
+                    b.Property("LastModificationTime")
+                        .IsRequired()
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("last_modification_time");
+
+                    b.Property("LastModifierId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_modifier_id");
+
+                    b.Property("MedicalCenterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("medical_center_id");
+
+                    b.Property("MobileTelephone")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)")
+                        .HasColumnName("mobile_telephone")
+                        .HasComment("手机");
+
+                    b.Property("Remark")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)")
+                        .HasColumnName("remark")
+                        .HasComment("备注");
+
+                    b.Property("Telephone")
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)")
+                        .HasColumnName("telephone")
+                        .HasComment("电话");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CardTypeId");
+
+                    b.HasIndex(new[] { "CardNo", "IsActive" }, "ix_card_register")
+                        .IsUnique();
+
+                    b.ToTable("card_register");
+
+                    b.HasComment("会员卡登记");
+                });
+
+            modelBuilder.Entity("Shentun.Peis.Models.CardType", b =>
+                {
+                    b.Property("Id")
+                        .HasColumnType("uuid")
+                        .HasColumnName("id")
+                        .IsFixedLength()
+                        .HasComment("编号");
+
+                    b.Property("CardModeId")
+                        .ValueGeneratedOnAdd()
+                        .HasMaxLength(1)
+                        .HasColumnType("character(1)")
+                        .HasColumnName("card_mode_id")
+                        .HasDefaultValueSql("0")
+                        .HasComment("卡模式");
+
+                    b.Property("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("concurrency_stamp");
+
+                    b.Property("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("creation_time");
+
+                    b.Property("CreatorId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("creator_id");
+
+                    b.Property("Discount")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("discount")
+                        .HasDefaultValueSql("100")
+                        .HasComment("折扣");
+
+                    b.Property("DisplayName")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)")
+                        .HasColumnName("display_name")
+                        .HasComment("名称");
+
+                    b.Property("DisplayOrder")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("display_order")
+                        .HasDefaultValueSql("999999")
+                        .HasComment("显示顺序");
+
+                    b.Property("ExpiryDay")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("expiry_day")
+                        .HasDefaultValueSql("3650")
+                        .HasComment("有效期");
+
+                    b.Property("LastModificationTime")
+                        .IsRequired()
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("last_modification_time");
+
+                    b.Property("LastModifierId")
+                        .IsRequired()
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_modifier_id");
+
+                    b.Property