单位

src/Shentun.Peis.Application.Contracts/CustomerOrgs/CreateCustomerOrgDto.cs

@@ -103,5 +103,10 @@ namespace Shentun.Peis.CustomerOrgs
         ///  组织 体检中心ID
         /// </summary>
         public Guid MedicalCenterId { get; set; }
+
+        /// <summary>
+        /// 国家组织机构代码
+        /// </summary>
+        public string CountryOrgCode { get; set; }
     }
 }

src/Shentun.Peis.Application.Contracts/CustomerOrgs/CustomerOrgDto.cs

@@ -116,6 +116,9 @@ namespace Shentun.Peis.CustomerOrgs
         /// </summary>
         public Guid MedicalCenterId { get; set; }
 
-       
+        /// <summary>
+        /// 国家组织机构代码
+        /// </summary>
+        public string CountryOrgCode { get; set; }
     }
 }

src/Shentun.Peis.Application.Contracts/CustomerOrgs/UpdateCustomerOrgDto.cs

@@ -103,5 +103,10 @@ namespace Shentun.Peis.CustomerOrgs
         /// 组织 体检中心ID
         /// </summary>
         public Guid MedicalCenterId { get; set; }
+
+        /// <summary>
+        /// 国家组织机构代码
+        /// </summary>
+        public string CountryOrgCode { get; set; }
     }
 }

src/Shentun.Peis.Application/CustomerOrgs/CustomerOrgAppService.cs

@@ -82,7 +82,7 @@ namespace Shentun.Peis.CustomerOrgs
         /// <param name="input"></param>
         /// <returns></returns>
         public async Task<List<CustomerOrgDto>> GetListInFilterAsync(GetListDto input)
-        { 
+        {
             var oldlist = await Repository.GetQueryableAsync();
             if (!string.IsNullOrEmpty(input.Filter))
                 oldlist = oldlist.Where(m => m.DisplayName.Contains(input.Filter));
@@ -90,7 +90,7 @@ namespace Shentun.Peis.CustomerOrgs
             if (input.IsHidePerson == 1)
                 oldlist = oldlist.Where(m => m.Id != GuidFlag.PersonCustomerOrgId);
 
-      
+
             var entdto = oldlist.Select(s => new CustomerOrgDto
             {
                 CreationTime = s.CreationTime,
@@ -116,13 +116,14 @@ namespace Shentun.Peis.CustomerOrgs
                 InvoiceName = s.InvoiceName,
                 IsLock = s.IsLock,
                 MedicalCenterId = s.MedicalCenterId,
+                CountryOrgCode = s.CountryOrgCode,
                 CreatorName = _cacheService.GetSurnameAsync(s.CreatorId).Result,
                 LastModifierName = _cacheService.GetSurnameAsync(s.LastModifierId).Result
             }).OrderBy(m => m.DisplayOrder).ToList();
 
 
 
-            return  entdto;
+            return entdto;
 
 
         }

src/Shentun.Peis.Application/DataMigrations/BaseDataHandleAppService.cs

@@ -2481,6 +2481,11 @@ namespace Shentun.Peis.DataMigrations
         }
 
 
+
+
+
+
+
         /// <summary>
         /// 迁移检查单  组合项目   查询register_asbitem
         /// </summary>
@@ -2996,7 +3001,7 @@ namespace Shentun.Peis.DataMigrations
 
             string nextKeyValue = Db.Ado.GetString("select keyvalue from tb_export_key where tablename='hand_patient_register'");
 
-            var oldPatientRegisterList = await Db.Ado.GetDataTableAsync("select top 1000  patient_register_id,register_doctor,register_date from patient_register where  patient_register_id>'{nextKeyValue}' order by patient_register_id asc ");
+            var oldPatientRegisterList = await Db.Ado.GetDataTableAsync($"select top 1000  patient_register_id,register_doctor,register_date from patient_register where  patient_register_id>'{nextKeyValue}' order by patient_register_id asc ");
             if (oldPatientRegisterList.Rows.Count > 0)
             {
                 var userList = await _identityUserRepository.GetListAsync();

src/Shentun.Peis.Domain/CustomerOrgs/CustomerOrg.cs

@@ -134,6 +134,13 @@ namespace Shentun.Peis.Models
         [Column("concurrency_stamp")]
         public string ConcurrencyStamp { get; set; }
 
+        /// <summary>
+        /// 国家组织机构代码
+        /// </summary>
+        [Column("country_org_code")]
+        [StringLength(20)]
+        public string CountryOrgCode { get; set; }
+
 
         //[Column("creator_id")]
         //public Guid CreatorId { get; set; }

src/Shentun.Peis.EntityFrameworkCore/Migrations/20240503112231_init20240503001.cs

@@ -0,0 +1,26 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Shentun.Peis.Migrations
+{
+    public partial class init20240503001 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "country_org_code",
+                table: "customer_org",
+                type: "character varying(20)",
+                maxLength: 20,
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "country_org_code",
+                table: "customer_org");
+        }
+    }
+}

src/Shentun.Peis.EntityFrameworkCore/Migrations/PeisDbContextModelSnapshot.cs

@@ -2502,6 +2502,11 @@ namespace Shentun.Peis.Migrations
                         .HasColumnType("character varying(40)")
                         .HasColumnName("concurrency_stamp");
 
+                    b.Property<string>("CountryOrgCode")
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)")
+                        .HasColumnName("country_org_code");
+
                     b.Property<DateTime>("CreationTime")
                         .HasColumnType("timestamp without time zone")
                         .HasColumnName("creation_time");