单位简称

src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs

@@ -3981,7 +3981,7 @@ namespace Shentun.Peis.PatientRegisters
                 ParentId = parentCustomerOrgEnt.Id,
                 PostalCode = parentCustomerOrgEnt.PostalCode,
                 Remark = parentCustomerOrgEnt.Remark,
-                ShortName = parentCustomerOrgEnt.ShortName,
+                ShortName = name.Length > 20 ? "" : name,
                 Telephone = parentCustomerOrgEnt.Telephone
             };
 

src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs

@@ -363,8 +363,8 @@ namespace Shentun.Peis.PrintReports
                     SampleContainerRemark = (o.sampleContainerHaveEmpty == null) ? "" : o.sampleContainerHaveEmpty.ContainerRemark,
                     SampleTypeName = (o.sampleTypeHaveEmpty == null) ? "" : o.sampleTypeHaveEmpty.DisplayName,
                     SexName = o.sex.DisplayName,
-                    CustomerOrgName = _cacheService.GetTopCustomerOrgAsync(o.patientRegister.CustomerOrgId).Result.ShortName,
-                    DepartmentName = _cacheService.GetCustomerOrgAsync(o.patientRegister.CustomerOrgId).Result.ShortName,
+                    CustomerOrgName = _cacheService.GetTopCustomerOrgShortNameAsync(o.patientRegister.CustomerOrgId).Result,
+                    DepartmentName = _cacheService.GetCustomerOrgShortNameAsync(o.patientRegister.CustomerOrgId).Result,
                     IsPrint = o.lisRequest.IsPrint,
                     IsSignIn = o.lisRequest.IsSignIn,
                     SamplingTime = o.lisRequest.SamplingTime,
@@ -544,8 +544,8 @@ namespace Shentun.Peis.PrintReports
                 ContainerColor = lisRequestInfo.sampleContainer.ContainerColor,
                 SampleContainerRemark = lisRequestInfo.sampleContainer.ContainerRemark,
                 AsbitemNames = string.Join(",", list.OrderBy(o => o.asbitem.DisplayOrder).Select(o => o.asbitem.DisplayName).Distinct()),
-                CustomerOrgName = _cacheService.GetTopCustomerOrgAsync(lisRequestInfo.patientRegister.CustomerOrgId).Result.ShortName,
-                DepartmentName = _cacheService.GetCustomerOrgAsync(lisRequestInfo.patientRegister.CustomerOrgId).Result.ShortName,
+                CustomerOrgName = _cacheService.GetTopCustomerOrgShortNameAsync(lisRequestInfo.patientRegister.CustomerOrgId).Result,
+                DepartmentName = _cacheService.GetCustomerOrgShortNameAsync(lisRequestInfo.patientRegister.CustomerOrgId).Result,
                 SampleGroupName = lisRequestInfo.sampleGroupName,
                 MobileTelephone = lisRequestInfo.patient.MobileTelephone,
                 SamplePrintCount = lisRequestInfo.samplePrintCount
@@ -818,8 +818,8 @@ namespace Shentun.Peis.PrintReports
                         PatientName = s.FirstOrDefault().PatientName,
                         PatientRegisterNo = s.FirstOrDefault().PatientRegisterNo,
                         SexName = s.FirstOrDefault().SexName,
-                        CustomerOrgName = _cacheService.GetTopCustomerOrgAsync(s.FirstOrDefault().CustomerOrgId).Result.ShortName,
-                        DepartmentName = _cacheService.GetCustomerOrgAsync(s.FirstOrDefault().CustomerOrgId).Result.ShortName,
+                        CustomerOrgName = _cacheService.GetTopCustomerOrgShortNameAsync(s.FirstOrDefault().CustomerOrgId).Result,
+                        DepartmentName = _cacheService.GetCustomerOrgShortNameAsync(s.FirstOrDefault().CustomerOrgId).Result,
                         MobileTelephone = s.FirstOrDefault().MobileTelephone
                     });
                 }
@@ -834,8 +834,8 @@ namespace Shentun.Peis.PrintReports
                         PatientName = s.FirstOrDefault().PatientName,
                         PatientRegisterNo = s.FirstOrDefault().PatientRegisterNo,
                         SexName = s.FirstOrDefault().SexName,
-                        CustomerOrgName = _cacheService.GetTopCustomerOrgAsync(s.FirstOrDefault().CustomerOrgId).Result.ShortName,
-                        DepartmentName = _cacheService.GetCustomerOrgAsync(s.FirstOrDefault().CustomerOrgId).Result.ShortName,
+                        CustomerOrgName = _cacheService.GetTopCustomerOrgShortNameAsync(s.FirstOrDefault().CustomerOrgId).Result,
+                        DepartmentName = _cacheService.GetCustomerOrgShortNameAsync(s.FirstOrDefault().CustomerOrgId).Result,
                         MobileTelephone = s.FirstOrDefault().MobileTelephone
                     });
                 }
@@ -899,8 +899,8 @@ namespace Shentun.Peis.PrintReports
                             PatientName = queryGroup.FirstOrDefault().PatientName,
                             PatientRegisterNo = queryGroup.FirstOrDefault().PatientRegisterNo,
                             SexName = queryGroup.FirstOrDefault().SexName,
-                            CustomerOrgName = _cacheService.GetTopCustomerOrgAsync(queryGroup.FirstOrDefault().CustomerOrgId).Result.ShortName,
-                            DepartmentName = _cacheService.GetCustomerOrgAsync(queryGroup.FirstOrDefault().CustomerOrgId).Result.ShortName
+                            CustomerOrgName = _cacheService.GetTopCustomerOrgShortNameAsync(queryGroup.FirstOrDefault().CustomerOrgId).Result,
+                            DepartmentName = _cacheService.GetCustomerOrgShortNameAsync(queryGroup.FirstOrDefault().CustomerOrgId).Result
                         };
                     }
                     else if (queryGroup.Where(m => m.BarcodeMode == '1').Count() > 0)
@@ -913,8 +913,8 @@ namespace Shentun.Peis.PrintReports
                             PatientName = queryGroup.FirstOrDefault().PatientName,
                             PatientRegisterNo = queryGroup.FirstOrDefault().PatientRegisterNo,
                             SexName = queryGroup.FirstOrDefault().SexName,
-                            CustomerOrgName = _cacheService.GetTopCustomerOrgAsync(queryGroup.FirstOrDefault().CustomerOrgId).Result.ShortName,
-                            DepartmentName = _cacheService.GetCustomerOrgAsync(queryGroup.FirstOrDefault().CustomerOrgId).Result.ShortName
+                            CustomerOrgName = _cacheService.GetTopCustomerOrgShortNameAsync(queryGroup.FirstOrDefault().CustomerOrgId).Result,
+                            DepartmentName = _cacheService.GetCustomerOrgShortNameAsync(queryGroup.FirstOrDefault().CustomerOrgId).Result
                         };
                     }
 

src/Shentun.Peis.Domain/CacheService.cs

@@ -350,6 +350,35 @@ namespace Shentun.Peis
             return entity;
         }
 
+        /// <summary>
+        /// 获取单位简称  一级单位    简称如果没有显示全称
+        /// </summary>
+        /// <param name="CustomerOrgId"></param>
+        /// <returns></returns>
+        public async Task<string> GetTopCustomerOrgShortNameAsync(Guid CustomerOrgId)
+        {
+            var customerOrgEnt = await GetTopCustomerOrgAsync(CustomerOrgId);
+            if (string.IsNullOrWhiteSpace(customerOrgEnt.ShortName))
+                return customerOrgEnt.DisplayName;
+            else
+                return customerOrgEnt.ShortName;
+        }
+
+
+        /// <summary>
+        /// 获取部门简称      简称如果没有显示全称
+        /// </summary>
+        /// <param name="CustomerOrgId"></param>
+        /// <returns></returns>
+        public async Task<string> GetCustomerOrgShortNameAsync(Guid CustomerOrgId)
+        {
+            var customerOrgEnt = await GetCustomerOrgAsync(CustomerOrgId);
+            if (string.IsNullOrWhiteSpace(customerOrgEnt.ShortName))
+                return customerOrgEnt.DisplayName;
+            else
+                return customerOrgEnt.ShortName;
+        }
+
         /// <summary>
         /// 缓存取单位名称   
         /// </summary>