111

src/Shentun.Pacs.Application.Contracts/PacsBusiness/GetPatientRegisterPacsCheckDto.cs

@@ -65,5 +65,36 @@ namespace Shentun.Pacs.PacsBusiness
         /// 是否发送结果到体检系统  Y  N
         /// </summary>
         public char IsSend { get; set; }
+
+        /// <summary>
+        /// 身份证号码
+        /// </summary>
+        public string IdNo { get; set; }
+
+        /// <summary>
+        /// 红豚档案号
+        /// </summary>
+        public string OldPatientNo { get; set; }
+
+        /// <summary>
+        /// 单位名称
+        /// </summary>
+        public string CustomerOrgName { get; set; }
+
+        /// <summary>
+        /// 年龄
+        /// </summary>
+        public short? Age { get; set; }
+
+        /// <summary>
+        /// 电话
+        /// </summary>
+        public string MobileTelephone { get; set; }
+
+        /// <summary>
+        /// 审核医生
+        /// </summary>
+        public string AuditorUserName { get; set; }
+
     }
 }

src/Shentun.Pacs.Application.Contracts/PacsBusiness/GetPatientRegisterPacsCheckInputDto.cs

@@ -65,5 +65,22 @@ namespace Shentun.Pacs.PacsBusiness
         /// </summary>
         public char? IsSend { get; set; }
 
+        /// <summary>
+        /// 身份证号码
+        /// </summary>
+        public string IdNo { get; set; }
+
+        /// <summary>
+        /// 红豚档案号
+        /// </summary>
+        public string OldPatientNo { get; set; }
+
+
+        /// <summary>
+        /// 单位
+        /// </summary>
+        public string CustomerOrgName { get; set; }
+
+
     }
 }

src/Shentun.Pacs.Application.Contracts/PacsBusiness/GetPeisPatientRegisterCompleteFlagDto.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shentun.Pacs.PacsBusiness
+{
+    public class GetPeisPatientRegisterCompleteFlagDto
+    {
+        /// <summary>
+        /// 人员状态
+        /// </summary>
+        public char CompleteFlag { get; set; }
+    }
+}

src/Shentun.Pacs.Application.Contracts/PacsBusiness/GetPreviousCheckResultDto.cs

@@ -0,0 +1,46 @@
+using Shentun.Pacs.SumSummaryReports;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shentun.Pacs.PacsBusiness
+{
+    public class GetPreviousCheckResultDto
+    {
+        /// <summary>
+        /// 检查时间
+        /// </summary>
+        public string CheckDate { get; set; }
+
+        /// <summary>
+        /// 小结
+        /// </summary>
+        public string Summary { get; set; }  
+
+        /// <summary>
+        /// 条码号
+        /// </summary>
+        public string BarcodeNo { get; set; }
+        /// <summary>
+        /// 检查医生
+        /// </summary>
+        public string CheckDoctor { get; set; }
+
+        public List<GetPreviousCheckResultWithCheckItemResultDto> RegisterItems { get; set; } = new List<GetPreviousCheckResultWithCheckItemResultDto>();
+    }
+ 
+
+    public class GetPreviousCheckResultWithCheckItemResultDto
+    {
+        /// <summary>
+        /// 项目名字
+        /// </summary>
+        public string ItemName { get; set; }
+
+        /// <summary>
+        /// 检查结果
+        /// </summary>
+        public string ResultValue { get; set; }
+ 
+    }
+}

src/Shentun.Pacs.Application.Contracts/PacsBusiness/GetPreviousCheckResultInputDto.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shentun.Pacs.PacsBusiness
+{
+    public class GetPreviousCheckResultInputDto
+    {
+        /// <summary>
+        /// 检查id
+        /// </summary>
+        public Guid RegisterCheckId { get; set; }
+    }
+}

src/Shentun.Pacs.Application.Contracts/PacsBusiness/ImportPeisCheckDataByCheckRequestNoInputDto.cs

@@ -7,7 +7,7 @@ namespace Shentun.Pacs.PacsBusiness
     public class ImportPeisCheckDataByCheckRequestNoInputDto
     {
         /// <summary>
-        /// 检查条码号
+        /// 检查条码号  红豚
         /// </summary>
         public string CheckRequestNo { get; set; }
 

src/Shentun.Pacs.Application.Contracts/PacsBusiness/OldPeisCheckResultDto.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shentun.Pacs.PacsBusiness
+{
+    public class OldPeisCheckResultDto
+    {
+        public DateTime check_date { get; set; }
+
+        public string summary { get; set; }
+
+        public string item_name { get; set; }
+
+        public string result { get; set; }
+
+        public string patient_register_id { get; set; }
+
+        public string user_name { get; set; }
+
+        public string barcode_no { get; set; }
+
+        public string asbitem_id { get; set; }
+
+        public int display_order { get; set; }
+    }
+}

src/Shentun.Pacs.Application.Contracts/PacsBusiness/UpdateCheckStatusByRegisterCheckIdInputDto.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shentun.Pacs.PacsBusiness
+{
+    public class UpdateCheckStatusByRegisterCheckIdInputDto
+    {
+        /// <summary>
+        /// 检查id
+        /// </summary>
+        public Guid RegisterCheckId { get; set; }
+
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public char CompleteFlag { get; set; }
+
+        /// <summary>
+        /// 发送到体检的状态  Y   N
+        /// </summary>
+        public char? IsSend { get; set; }
+    }
+}

src/Shentun.Pacs.Application/PacsBusiness/PacsBusinessAppService.cs

@@ -83,6 +83,10 @@ namespace Shentun.Pacs.PacsBusiness
         private readonly UnitOfWorkManager _unitOfWorkManager;
         private readonly IRepository<RegisterCheckSummary, Guid> _registerCheckSummaryRepository;
         private readonly SysParmValueManager _sysParmValueManager;
+        private readonly IRepository<Item, Guid> _itemRepository;
+
+        private readonly SqlSugarClient oldDb;
+
 
         public PacsBusinessAppService(
             IConfiguration configuration,
@@ -116,7 +120,8 @@ namespace Shentun.Pacs.PacsBusiness
             CacheService cacheService,
             UnitOfWorkManager unitOfWorkManager,
             IRepository<RegisterCheckSummary, Guid> registerCheckSummaryRepository,
-            SysParmValueManager sysParmValueManager)
+            SysParmValueManager sysParmValueManager,
+            IRepository<Item, Guid> itemRepository)
         {
             _configuration = configuration;
             _registerCheckRepository = registerCheckRepository;
@@ -150,6 +155,18 @@ namespace Shentun.Pacs.PacsBusiness
             _unitOfWorkManager = unitOfWorkManager;
             _registerCheckSummaryRepository = registerCheckSummaryRepository;
             _sysParmValueManager = sysParmValueManager;
+            _itemRepository = itemRepository;
+
+
+            oldDb = new SqlSugarClient(new ConnectionConfig()
+            {
+                ConnectionString = _configuration.GetValue<string>("OldPeis:ConnectionStrings", ""),
+                DbType = SqlSugar.DbType.SqlServer,
+                IsAutoCloseConnection = true
+            });
+
+
+
         }
 
 
@@ -440,6 +457,7 @@ namespace Shentun.Pacs.PacsBusiness
         public async Task<PagedResultDto<GetPatientRegisterPacsCheckDto>> GetPatientRegisterPacsCheckAsync(GetPatientRegisterPacsCheckInputDto input)
         {
             var query = from patientRegister in await _patientRegisterRepository.GetQueryableAsync()
+                        join patient in await _patientRepository.GetQueryableAsync() on patientRegister.PatientId equals patient.Id
                         join registerCheck in await _registerCheckRepository.GetQueryableAsync() on patientRegister.Id equals registerCheck.PatientRegisterId
                         join registerCheckAsbitem in await _registerCheckAsbitemRepository.GetQueryableAsync() on registerCheck.Id equals registerCheckAsbitem.RegisterCheckId
                         join asbitem in await _asbitemRepository.GetQueryableAsync() on registerCheckAsbitem.AsbitemId equals asbitem.Id
@@ -468,7 +486,13 @@ namespace Shentun.Pacs.PacsBusiness
                             encodingFlag = deviceHaveEmpty == null ? '0' : deviceHaveEmpty.EncodingFlag,
                             isFilmRelease = asbitem.IsFilmRelease,
                             checkDoctorId = registerCheck.CheckDoctorId,
-                            isSend = registerCheck.IsSend
+                            isSend = registerCheck.IsSend,
+                            customerOrgName = patientRegister.CustomerOrgName,
+                            oldPatientNo = patientRegister.OldPatientNo,
+                            idNo = patient.IdNo,
+                            age = patientRegister.Age,
+                            mobileTelephone = patient.MobileTelephone,
+                            auditorUserName = _cacheService.GetSurnameAsync(registerCheck.AuditorUserId).GetAwaiter().GetResult()
                         };
 
             if (!string.IsNullOrWhiteSpace(input.PatientName))
@@ -577,6 +601,20 @@ namespace Shentun.Pacs.PacsBusiness
 
             //#endregion
 
+            if (!string.IsNullOrWhiteSpace(input.IdNo))
+            {
+                query = query.Where(m => m.idNo == input.IdNo);
+            }
+
+            if (!string.IsNullOrWhiteSpace(input.OldPatientNo))
+            {
+                query = query.Where(m => m.oldPatientNo == input.OldPatientNo);
+            }
+
+            if (!string.IsNullOrWhiteSpace(input.CustomerOrgName))
+            {
+                query = query.Where(m => m.customerOrgName.Contains(input.OldPatientNo));
+            }
 
             var checkRequestNoGroup = query.ToList().GroupBy(g => g.registerCheckId);
 
@@ -613,7 +651,13 @@ namespace Shentun.Pacs.PacsBusiness
                     MedicalTypeName = _cacheService.GetMedicalTypeNameAsync(fisrtItem.medicalTypeId).GetAwaiter().GetResult(),
                     CheckDoctorId = fisrtItem.checkDoctorId,
                     CheckDoctorName = _cacheService.GetSurnameAsync(fisrtItem.checkDoctorId).GetAwaiter().GetResult(),
-                    IsSend = fisrtItem.isSend
+                    IsSend = fisrtItem.isSend,
+                    Age = fisrtItem.age,
+                    AuditorUserName = fisrtItem.auditorUserName,
+                    IdNo = fisrtItem.idNo,
+                    OldPatientNo = fisrtItem.oldPatientNo,
+                    CustomerOrgName = fisrtItem.customerOrgName,
+                    MobileTelephone = fisrtItem.mobileTelephone
                 });
             }
 
@@ -1271,13 +1315,13 @@ namespace Shentun.Pacs.PacsBusiness
 
 
 
-            string connectionString = _configuration.GetValue<string>("OldPeis:ConnectionStrings", "");
-            SqlSugarClient oldDb = new SqlSugarClient(new ConnectionConfig()
-            {
-                ConnectionString = connectionString,
-                DbType = SqlSugar.DbType.SqlServer,
-                IsAutoCloseConnection = true
-            });
+            //string connectionString = _configuration.GetValue<string>("OldPeis:ConnectionStrings", "");
+            //SqlSugarClient oldDb = new SqlSugarClient(new ConnectionConfig()
+            //{
+            //    ConnectionString = connectionString,
+            //    DbType = SqlSugar.DbType.SqlServer,
+            //    IsAutoCloseConnection = true
+            //});
 
 
             string registerAsbitemSql = "";
@@ -1286,9 +1330,11 @@ namespace Shentun.Pacs.PacsBusiness
             {
                 registerAsbitemSql = "select a.name as patient_name,a.sex_id,a.mobile_telephone,a.telephone," +
                 "a.age,a.id_card_no,a.marital_status_id,a.complete_flag,a.birth_date,a.medical_type_id," +
-                "b.patient_register_id,b.print_barcode_no,b.asbitem_id,b.price,b.standard_price,b.charge_flag,b.payment_mode " +
-                "from patient_register  as a left join  register_asbitem as b on a.patient_register_id=b.patient_register_id " +
+                "b.patient_register_id,b.print_barcode_no,b.asbitem_id,b.price,b.standard_price,b.charge_flag,b.payment_mode,a.patient_id,d.org_name " +
+                "from patient_register  as a " +
+                " left join  register_asbitem as b on a.patient_register_id=b.patient_register_id " +
                 " left join asbitem as c on b.asbitem_id=c.asbitem_id " +
+                " left join org as d on a.org_id=d.org_id " +
                 $" where a.barcode_no='{input.CheckRequestNo}' and c.device_type_id='{oldDeviceTypeId}' ";
             }
             else
@@ -1296,9 +1342,11 @@ namespace Shentun.Pacs.PacsBusiness
 
                 registerAsbitemSql = "select a.name as patient_name,a.sex_id,a.mobile_telephone,a.telephone," +
                 "a.age,a.id_card_no,a.marital_status_id,a.complete_flag,a.birth_date,a.medical_type_id," +
-                "b.patient_register_id,b.print_barcode_no,b.asbitem_id,b.price,b.standard_price,b.charge_flag,b.payment_mode " +
-                "from patient_register  as a left join  register_asbitem as b on a.patient_register_id=b.patient_register_id " +
+                "b.patient_register_id,b.print_barcode_no,b.asbitem_id,b.price,b.standard_price,b.charge_flag,b.payment_mode,a.patient_id,d.org_name " +
+                "from patient_register  as a " +
+                " left join  register_asbitem as b on a.patient_register_id=b.patient_register_id " +
                 " left join asbitem as c on b.asbitem_id=c.asbitem_id " +
+                " left join org as d on a.org_id=d.org_id " +
                 $" where b.print_barcode_no='{input.CheckRequestNo}' and c.device_type_id='{oldDeviceTypeId}' ";
 
             }
@@ -1446,7 +1494,8 @@ namespace Shentun.Pacs.PacsBusiness
                     var patientRegisterEnt = new PatientRegister(GuidGenerator.Create())
                     {
                         Age = age,
-                        CompleteFlag = Convert.ToChar(row["complete_flag"].ToString()),
+                        //CompleteFlag = Convert.ToChar(row["complete_flag"].ToString()),
+                        CompleteFlag = PatientRegisterCompleteFlag.PartCheck,
                         CustomerOrgId = GuidFlag.PersonCustomerOrgId,
                         CustomerOrgRegisterId = GuidFlag.PersonCustomerOrgRegisterId,
                         DeviceId = Guid.Parse(input.DeviceId),
@@ -1470,7 +1519,9 @@ namespace Shentun.Pacs.PacsBusiness
                         SendFlag = '0',
                         SexId = sexId,
                         BirthDate = newBirthDate,
-                        MedicalTypeId = newMedicalTypeId
+                        MedicalTypeId = newMedicalTypeId,
+                        OldPatientNo = row["patient_id"].ToString(),
+                        CustomerOrgName = row["org_name"].ToString()
                     };
 
                     patientRegisterEnt = await _patientRegisterRepository.InsertAsync(patientRegisterEnt, true);
@@ -1859,6 +1910,10 @@ namespace Shentun.Pacs.PacsBusiness
 
             //更新发送状态
             registerCheckFirst.registerCheck.IsSend = 'Y';
+            //更新审核状态
+            registerCheckFirst.registerCheck.IsAudit = 'Y';
+            registerCheckFirst.registerCheck.AuditorUserId = _currentUser.Id;
+
             await _registerCheckRepository.UpdateAsync(registerCheckFirst.registerCheck);
 
         }
@@ -1937,6 +1992,143 @@ namespace Shentun.Pacs.PacsBusiness
 
         }
 
+
+        /// <summary>
+        /// 根据检查id获取体检系统人员的检查状态
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("api/app/PacsBusiness/GetPeisPatientRegisterCompleteFlag")]
+        public async Task<GetPeisPatientRegisterCompleteFlagDto> GetPeisPatientRegisterCompleteFlagAsync(RegisterCheckIdInputDto input)
+        {
+            var registerCheckFirst = (from patientRegister in await _patientRegisterRepository.GetQueryableAsync()
+                                      join registerCheck in await _registerCheckRepository.GetQueryableAsync() on patientRegister.Id equals registerCheck.PatientRegisterId
+                                      join registerCheckAsbitem in await _registerCheckAsbitemRepository.GetQueryableAsync() on registerCheck.Id equals registerCheckAsbitem.RegisterCheckId
+                                      where registerCheck.Id == input.RegisterCheckId
+                                      select new
+                                      {
+                                          registerCheckAsbitem
+                                      }).FirstOrDefault();
+
+            if (registerCheckFirst == null)
+            {
+                throw new UserFriendlyException("检查id不正确");
+            }
+
+            string connectionString = _configuration.GetValue<string>("OldPeis:ConnectionStrings", "");
+            SqlSugarClient oldDb = new SqlSugarClient(new ConnectionConfig()
+            {
+                ConnectionString = connectionString,
+                DbType = SqlSugar.DbType.SqlServer,
+                IsAutoCloseConnection = true
+            });
+
+
+            string completeFlag = (await oldDb.Ado.GetScalarAsync("select complete_flag from patient_register where patient_register_id=@patient_register_id ",
+                new List<SugarParameter>() {
+                     new SugarParameter("patient_register_id",registerCheckFirst.registerCheckAsbitem.OldPatientRegisterId)
+                   })).ToString();
+
+            if (string.IsNullOrWhiteSpace(completeFlag))
+            {
+                throw new UserFriendlyException("体检系统未查到相关信息");
+            }
+
+
+            var entDto = new GetPeisPatientRegisterCompleteFlagDto
+            {
+                CompleteFlag = Convert.ToChar(completeFlag)
+            };
+
+            return entDto;
+
+        }
+
+        /// <summary>
+        /// 修改检查状态 根据RegisterCheckId
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("api/app/PacsBusiness/UpdateCheckStatusByRegisterCheckId")]
+        public async Task UpdateCheckStatusByRegisterCheckIdAsync(UpdateCheckStatusByRegisterCheckIdInputDto input)
+        {
+            var registerCheckFirst = await _registerCheckRepository.FirstOrDefaultAsync(f => f.Id == input.RegisterCheckId);
+            if (registerCheckFirst == null)
+            {
+                throw new UserFriendlyException("检查id不正确");
+            }
+
+            registerCheckFirst.CompleteFlag = input.CompleteFlag;
+
+            if (input.IsSend != null)
+            {
+                registerCheckFirst.IsSend = input.IsSend.Value;
+            }
+
+            await _registerCheckRepository.UpdateAsync(registerCheckFirst);
+        }
+
+        /// <summary>
+        /// 获取历次检查结果  
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("api/app/PacsBusiness/GetPreviousCheckResult")]
+        public async Task<List<GetPreviousCheckResultDto>> GetPreviousCheckResultAsync(RegisterCheckIdInputDto input)
+        {
+            var paraQuery = (from patientRegister in await _patientRegisterRepository.GetQueryableAsync()
+                             join registerCheck in await _registerCheckRepository.GetQueryableAsync() on patientRegister.Id equals registerCheck.PatientRegisterId
+                             join registerCheckAsbitem in await _registerCheckAsbitemRepository.GetQueryableAsync() on registerCheck.Id equals registerCheckAsbitem.RegisterCheckId
+                             where registerCheck.Id == input.RegisterCheckId
+                             select new
+                             {
+                                 oldPatientNo = patientRegister.OldPatientNo,
+                                 asbitemId = registerCheckAsbitem.AsbitemId
+                             }).ToList();
+
+            if (!paraQuery.Any())
+            {
+                throw new UserFriendlyException("检查id未找到数据");
+            }
+
+            var asbitemId = paraQuery.FirstOrDefault().asbitemId;
+            var oldPatientNo = paraQuery.FirstOrDefault().oldPatientNo;
+
+            if (string.IsNullOrWhiteSpace(oldPatientNo))
+            {
+                throw new UserFriendlyException("当前记录未存体检档案号，无法查询");
+            }
+
+
+
+            string oldSql = "select b.check_date,b.summary,d.item_name,d.display_order,c.result,e.user_name,a.barcode_no,a.patient_register_id," +
+                "b.asbitem_id from patient_register as a" +
+                " left join register_asbitem as b on a.patient_register_id=b.patient_register_id " +
+                " left join register_item as c on b.asbitem_id=c.asbitem_id and a.patient_register_id=c.patient_register_id " +
+                " left join item as d on c.item_id=d.item_id " +
+                " left join users as e on b.check_doctor=e.user_id " +
+                $" where a.patient_id={oldPatientNo} and b.asbitem_id={asbitemId}";
+
+            var oldPeisCheckResultList = oldDb.Ado.SqlQuery<OldPeisCheckResultDto>(oldSql);
+
+            var entListDto = oldPeisCheckResultList.GroupBy(g => new { g.asbitem_id, g.patient_register_id }).OrderByDescending(o => o.Key.patient_register_id)
+                .Select(s => new GetPreviousCheckResultDto
+                {
+                    CheckDate = DataHelper.ConversionDateShortToString(s.FirstOrDefault().check_date),
+                    Summary = s.FirstOrDefault().summary,
+                    BarcodeNo = s.FirstOrDefault().barcode_no,
+                    CheckDoctor = s.FirstOrDefault().user_name,
+                    RegisterItems = s.OrderBy(o => o.display_order).Select(ss => new GetPreviousCheckResultWithCheckItemResultDto
+                    {
+                        ItemName = ss.item_name,
+                        ResultValue = ss.result
+                    }).Distinct().ToList()
+                }).ToList();
+
+
+
+            return entListDto;
+        }
+
         #endregion
 
 

src/Shentun.Pacs.Domain/PatientRegisters/PatientRegister.cs

@@ -340,6 +340,18 @@ namespace Shentun.Pacs.Models
         [Column("send_date")]
         public DateTime? SendDate { get; set; }
 
+        /// <summary>
+        /// 红豚档案号
+        /// </summary>
+        [Column("old_patient_no")]
+        public string OldPatientNo { get; set; }
+
+        /// <summary>
+        /// 红豚单位名称
+        /// </summary>
+        [Column("customer_org_name")]
+        public string CustomerOrgName { get; set; }
+
         /// <summary>
         /// 修改登记人
         /// </summary>

src/Shentun.Pacs.EntityFrameworkCore/DbMapping/PatientRegisters/PatientRegisterDbMapping.cs

@@ -102,6 +102,9 @@ namespace Shentun.Pacs.DbMapping
 
             entity.Property(t => t.SendFlag).HasComment("发送状态  0-未发送  1-发送").IsRequired().HasDefaultValueSql("'0'");
             entity.Property(t => t.SendDate).HasComment("发送时间");
+            entity.Property(t => t.OldPatientNo).HasComment("红豚档案号");
+            entity.Property(t => t.CustomerOrgName).HasComment("红豚单位名称");
+            
 
             //entity.HasOne(d => d.CustomerOrgRegister)
             //    .WithMany(p => p.PatientRegisters)

src/Shentun.Pacs.EntityFrameworkCore/Migrations/20250530105914_update_patient_register_add_oldpatientno.cs

@@ -0,0 +1,37 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Shentun.Pacs.Migrations
+{
+    public partial class update_patient_register_add_oldpatientno : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "customer_org_name",
+                table: "patient_register",
+                type: "text",
+                nullable: true,
+                comment: "红豚单位名称");
+
+            migrationBuilder.AddColumn<string>(
+                name: "old_patient_no",
+                table: "patient_register",
+                type: "text",
+                nullable: true,
+                comment: "红豚档案号");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "customer_org_name",
+                table: "patient_register");
+
+            migrationBuilder.DropColumn(
+                name: "old_patient_no",
+                table: "patient_register");
+        }
+    }
+}

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

@@ -7597,6 +7597,11 @@ namespace Shentun.Pacs.Migrations
                         .IsFixedLength()
                         .HasComment("单位编号");
 
+                    b.Property<string>("CustomerOrgName")
+                        .HasColumnType("text")
+                        .HasColumnName("customer_org_name")
+                        .HasComment("红豚单位名称");
+
                     b.Property<Guid>("CustomerOrgRegisterId")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid")
@@ -7776,6 +7781,11 @@ namespace Shentun.Pacs.Migrations
                         .IsFixedLength()
                         .HasComment("体检类别");
 
+                    b.Property<string>("OldPatientNo")
+                        .HasColumnType("text")
+                        .HasColumnName("old_patient_no")
+                        .HasComment("红豚档案号");
+
                     b.Property<Guid>("PatientId")
                         .HasColumnType("uuid")
                         .HasColumnName("patient_id")