报告，排序，简称

src/Shentun.Peis.Application.Contracts/OrganizationUnits/TreeChildViewDto.cs

@@ -17,6 +17,11 @@ namespace Shentun.Peis.OrganizationUnits
         /// </summary>
         public string Code { get; set; }
 
+        /// <summary>
+        /// 短名称
+        /// </summary>
+        public string ShortName { get; set; }
+
         /// <summary>
         /// 拼音简码
         /// </summary>

src/Shentun.Peis.Application/AsbitemDetails/AsbitemDetailAppService.cs

@@ -29,12 +29,19 @@ namespace Shentun.Peis.AsbitemDetails
         private readonly IRepository<AsbitemDetail> _repository;
         private readonly IRepository<IdentityUser, Guid> _userRepository;
         private readonly AsbitemDetailManager _manager;
-
-        public AsbitemDetailAppService(IRepository<AsbitemDetail> repository, IRepository<IdentityUser, Guid> userRepository, AsbitemDetailManager manager)
+        private readonly CacheService _cacheService;
+
+        public AsbitemDetailAppService(
+            IRepository<AsbitemDetail> repository,
+            IRepository<IdentityUser, Guid> userRepository,
+            AsbitemDetailManager manager,
+            CacheService cacheService
+            )
         {
             this._repository = repository;
             this._userRepository = userRepository;
             this._manager = manager;
+            _cacheService = cacheService;
         }
 
         /// <summary>
@@ -79,12 +86,12 @@ namespace Shentun.Peis.AsbitemDetails
                 {
                     await _repository.InsertManyAsync(asbitemDetails);
                 }
-                 
+
             }
         }
 
 
-       
+
 
 
         /// <summary>
@@ -95,11 +102,9 @@ namespace Shentun.Peis.AsbitemDetails
         public async Task<List<ItemDto>> GetAsbitemDetailInItemAsync(AsbitemDetailInItemDto input)
         {
 
-            var entlist = _repository.GetDbSetAsync().Result.Include(c => c.Item)
-                .Where(m => m.AsbitemId == input.AsbitemId).ToList();
-
-
-            var userList = await _userRepository.GetListAsync();
+            var entlist = (await _repository.GetQueryableAsync()).Include(x => x.Item).ThenInclude(x => x.ItemType)
+                .Where(m => m.AsbitemId == input.AsbitemId)
+                .OrderBy(o => o.Item.ItemType.DisplayOrder).ThenBy(o => o.Item.DisplayOrder);
 
             var entdto = entlist.Select(s => new ItemDto
             {
@@ -128,8 +133,8 @@ namespace Shentun.Peis.AsbitemDetails
                 ReferenceRangeTypeFlag = s.Item.ReferenceRangeTypeFlag,
                 ResultTemplateTypeFlag = s.Item.ResultTemplateTypeFlag,
                 UnitId = s.Item.UnitId,
-                CreatorName = EntityHelper.GetSurnameNoSql(userList, s.Item.CreatorId),
-                LastModifierName = EntityHelper.GetSurnameNoSql(userList, s.Item.LastModifierId)
+                CreatorName = _cacheService.GetSurnameAsync(s.Item.CreatorId).Result,
+                LastModifierName = _cacheService.GetSurnameAsync(s.Item.LastModifierId).Result
             }).ToList();
 
             return entdto;

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

@@ -86,11 +86,11 @@ namespace Shentun.Peis.CustomerOrgs
         /// <param name="input"></param>
         /// <returns></returns>
         [HttpPost("api/app/CustomerOrg/GetChildCustomerOrgsById")]
-        public  async Task<List<CustomerOrgDto>> GetChildCustomerOrgsByIdAsync(CustomerOrgIdInputDto input)
+        public async Task<List<CustomerOrgDto>> GetChildCustomerOrgsByIdAsync(CustomerOrgIdInputDto input)
         {
-            var list = await Repository.GetListAsync(o=>o.ParentId == input.CustomerOrgId);
+            var list = await Repository.GetListAsync(o => o.ParentId == input.CustomerOrgId);
             var dtos = new List<CustomerOrgDto>();
-            foreach(var customerOrg in list)
+            foreach (var customerOrg in list)
             {
                 var entityDto = ObjectMapper.Map<CustomerOrg, CustomerOrgDto>(customerOrg);
                 entityDto.CreatorName = await _cacheService.GetSurnameAsync(entityDto.CreatorId);
@@ -295,7 +295,8 @@ namespace Shentun.Peis.CustomerOrgs
                             ParentId = p.ParentId,
                             Code = p.PathCode,
                             DisplayName = p.DisplayName,
-                            SimpleCode = p.SimpleCode
+                            SimpleCode = p.SimpleCode,
+                            ShortName = p.ShortName
                         };
             return GetTree(items.ToList(), 0, "");
         }
@@ -319,6 +320,7 @@ namespace Shentun.Peis.CustomerOrgs
                         Code = p.Code,
                         DisplayName = p.DisplayName,
                         SimpleCode = p.SimpleCode,
+                        ShortName = p.ShortName,
                         TreeChildren = subs.ToList()
                     }
                     ).ToList();

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

@@ -884,7 +884,7 @@ namespace Shentun.Peis.PatientRegisters
         }
 
         /// <summary>
-        /// 新版人物登记
+        /// 新版人员登记
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>

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

@@ -479,7 +479,7 @@ namespace Shentun.Peis.PrintReports
         public async Task<MedicalReportDto> GetMedicalReportAsync(PatientRegisterIdInputDto input)
         {
 
-            var patientRegister = (await _patientRegisterRepository.GetDbSetAsync())
+            var patientRegister = (await _patientRegisterRepository.GetQueryableAsync())
                .Include(x => x.Patient)
                .Where(m => m.Id == input.PatientRegisterId).FirstOrDefault();
             if (patientRegister == null)
@@ -948,6 +948,24 @@ namespace Shentun.Peis.PrintReports
             {
                 medicalReportDto.IsPersonal = 'Y';
             }
+
+            if (patientRegister.MedicalPackageId != null)
+            {
+                var medicalPackageEnt = await _medicalPackageRepository.FirstOrDefaultAsync(f => f.Id == patientRegister.MedicalPackageId);
+                if (medicalPackageEnt != null)
+                {
+                    medicalReportDto.MedicalPackageOrCustomerOrgGroupName = medicalPackageEnt.DisplayName;
+                }
+            }
+            else
+            {
+                var customerOrgGroupEnt = await  _customerOrgGroupRepository.FirstOrDefaultAsync(f => f.Id == patientRegister.CustomerOrgGroupId);
+                if (customerOrgGroupEnt != null)
+                {
+                    medicalReportDto.MedicalPackageOrCustomerOrgGroupName = customerOrgGroupEnt.DisplayName;
+                }
+            }
+
             #endregion
             return medicalReportDto;
         }

src/Shentun.Peis.Application/RegisterCheckItems/RegisterCheckItemAppService.cs

@@ -69,7 +69,7 @@ namespace Shentun.Peis.RegisterCheckItems
                 .Include(x => x.Item.ItemType)
                 .Include(x => x.RegisterCheck)
                 .Where(m => m.RegisterCheckId == RegisterCheckId)
-                .OrderBy(o=>o.Item.DisplayOrder).ToList();
+                .OrderBy(o => o.Item.ItemType.DisplayOrder).ThenBy(o => o.Item.DisplayOrder).ToList();
 
 
 
@@ -102,7 +102,7 @@ namespace Shentun.Peis.RegisterCheckItems
                     {
                         ent.Unit = unit.DisplayName;
                     }
-                   
+
                     update_list.Add(ent);
                 }
             }
@@ -119,7 +119,7 @@ namespace Shentun.Peis.RegisterCheckItems
 
 
 
-           
+
             var entdto = entlist.Select(s => new RegisterCheckItemOrItemOrItemResultTemplateDto
             {
 
@@ -130,7 +130,7 @@ namespace Shentun.Peis.RegisterCheckItems
                 ItemId = s.ItemId,
                 IsCalculationItem = s.Item.IsCalculationItem,
                 ItemName = s.Item.DisplayName,
-                itemResultTemplates = s.Item.ItemResultTemplates.OrderBy(o=>o.DisplayOrder).
+                itemResultTemplates = s.Item.ItemResultTemplates.OrderBy(o => o.DisplayOrder).
                 Select(si => new ItemResultTemplates.ItemResultTemplateDropDto
                 {
                     DiagnosisId = si.DiagnosisId,