From 590dc0ed1124a16b61474e3b7b683204c519e5db Mon Sep 17 00:00:00 2001
From: wxd <123@qq.com>
Date: Fri, 15 Nov 2024 09:38:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=86=E7=BB=84=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomerOrgRegisterAppService.cs          | 20 ++++++++++++++++---
 .../PatientRegisterAppService.cs              | 12 +++++------
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/Shentun.Peis.Application/CustomerOrgRegisters/CustomerOrgRegisterAppService.cs b/src/Shentun.Peis.Application/CustomerOrgRegisters/CustomerOrgRegisterAppService.cs
index 23ace90..ba3e67e 100644
--- a/src/Shentun.Peis.Application/CustomerOrgRegisters/CustomerOrgRegisterAppService.cs
+++ b/src/Shentun.Peis.Application/CustomerOrgRegisters/CustomerOrgRegisterAppService.cs
@@ -70,7 +70,7 @@ namespace Shentun.Peis.CustomerOrgRegisters
         /// <param name="input"></param>
         /// <returns></returns>
         [HttpPost("api/app/CustomerOrgRegister/GetById")]
-        public  async Task<CustomerOrgRegisterDto> GetByIdAsync(CustomerOrgRegisterIdInputDto input)
+        public async Task<CustomerOrgRegisterDto> GetByIdAsync(CustomerOrgRegisterIdInputDto input)
         {
             return await base.GetAsync(input.CustomerOrgRegisterId);
         }
@@ -193,8 +193,22 @@ namespace Shentun.Peis.CustomerOrgRegisters
         public async Task<List<CustomerOrgRegisterDto>> GetListInCustomerOrgIdAsync(Guid CustomerOrgId)
         {
 
+            #region 查找一级单位
 
-            //if (CustomerOrgId != Guid.Empty)
+            var customerOrgEnt = await _customerOrgRepository.FirstOrDefaultAsync(f => f.Id == CustomerOrgId);
+            if (customerOrgEnt != null && customerOrgEnt.ParentId != null && customerOrgEnt.PathCode.Length > 5)
+            {
+                string topPathCode = customerOrgEnt.PathCode.Substring(0, 5);
+                customerOrgEnt = await _customerOrgRepository.FirstOrDefaultAsync(f => f.PathCode == topPathCode);
+                if (customerOrgEnt != null)
+                {
+                    CustomerOrgId = customerOrgEnt.Id;
+                }
+            }
+
+            #endregion
+
+ 
             var entlist = (await Repository.GetQueryableAsync()).Where(m => m.CustomerOrgId == CustomerOrgId).ToList();
 
 
@@ -230,7 +244,7 @@ namespace Shentun.Peis.CustomerOrgRegisters
         public async Task<CustomerOrgRegisterDto> GetLastCustomerOrgRegisterByCustomerOrgId(CustomerOrgIdInputDto input)
         {
             var entity = (await Repository.GetQueryableAsync()).Where(m => m.CustomerOrgId == input.CustomerOrgId)
-                .OrderByDescending(o=>o.MedicalTimes).FirstOrDefault();
+                .OrderByDescending(o => o.MedicalTimes).FirstOrDefault();
 
 
             var entdto = new CustomerOrgRegisterDto()
diff --git a/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs b/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs
index 869e514..2934a2f 100644
--- a/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs
+++ b/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs
@@ -3499,8 +3499,8 @@ namespace Shentun.Peis.PatientRegisters
                     SummaryDate = DataHelper.ConversionDateToString(ent.SummaryDate),
                     SummaryDoctorId = ent.SummaryDoctorId,
                     ThirdInfo = ent.ThirdInfo,
-                    CreatorName = _cacheService.GetSurnameAsync(ent.CreatorId).Result,
-                    LastModifierName = _cacheService.GetSurnameAsync(ent.LastModifierId).Result,
+                    CreatorName = _cacheService.GetSurnameAsync(ent.CreatorId).GetAwaiter().GetResult(),
+                    LastModifierName = _cacheService.GetSurnameAsync(ent.LastModifierId).GetAwaiter().GetResult(),
                     Address = ent.Patient.Address,  //档案表信息
                     BirthPlaceId = ent.Patient.BirthPlaceId,
                     DisplayName = ent.Patient.DisplayName,
@@ -3512,10 +3512,10 @@ namespace Shentun.Peis.PatientRegisters
                     PatientPassword = ent.Patient.PatientPassword,
                     PostalCode = ent.Patient.PostalCode,
                     Telephone = ent.Patient.Telephone,
-                    CustomerOrgName = _cacheService.GetCustomerOrgNameAsync(ent.CustomerOrgId).Result,
-                    CustomerOrgParentName = _cacheService.GetTopCustomerOrgNameAsync(ent.CustomerOrgId).Result,
-                    CustomerOrgParentId = _cacheService.GetTopCustomerOrgAsync(ent.CustomerOrgId).Result.Id,
-                    IsPatientOccupationalDisease = _patientOccupationalDiseaseManager.GetPatientRegisterIsOccupationalDisease(ent.Id).Result
+                    CustomerOrgName = _cacheService.GetCustomerOrgNameAsync(ent.CustomerOrgId).GetAwaiter().GetResult(),
+                    CustomerOrgParentName = _cacheService.GetTopCustomerOrgNameAsync(ent.CustomerOrgId).GetAwaiter().GetResult(),
+                    CustomerOrgParentId = _cacheService.GetTopCustomerOrgIdAsync(ent.CustomerOrgId).GetAwaiter().GetResult(),
+                    IsPatientOccupationalDisease = _patientOccupationalDiseaseManager.GetPatientRegisterIsOccupationalDisease(ent.Id).GetAwaiter().GetResult()
                 };
                 var registerCheckAsbitems = (await _registerCheckAsbitemRepository.GetQueryableAsync())
               .Include(x => x.Asbitem)