修复

src/Shentun.Peis.Application.Contracts/CriticalFollowValueTypes/CriticalFollowValueTypeDto.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+using System.Text;
+
+namespace Shentun.Peis.CriticalFollowValueTypes
+{
+    public class CriticalFollowValueTypeDto:AuditedEntityDtoName
+    {
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string DisplayName { get; set; } 
+
+        /// <summary>
+        /// 父编号
+        /// </summary>
+        public Guid ParentId { get; set; }
+
+        /// <summary>
+        /// 路径编码
+        /// </summary>
+        public string PathCode { get; set; } 
+
+
+        public int DisplayOrder { get; set; }
+    }
+}

src/Shentun.Peis.Application.Contracts/CriticalFollowValueTypes/CriticalFollowValueTypeIdInputDto.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shentun.Peis.CriticalFollowValueTypes
+{
+    public class CriticalFollowValueTypeIdInputDto
+    {
+        public Guid CriticalFollowValueTypeId { get; set; }
+    }
+}

src/Shentun.Peis.Application/CriticalFollowValueTypes/CriticalFollowValueTypeAppService.cs

@@ -0,0 +1,72 @@
+using AutoMapper.Internal.Mappers;
+using Microsoft.AspNetCore.Mvc;
+using Shentun.Peis.ItemTypes;
+using Shentun.Peis.Models;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
+using Volo.Abp.Domain.Repositories;
+
+namespace Shentun.Peis.CriticalFollowValueTypes
+{
+    public class CriticalFollowValueTypeAppService : ApplicationService
+    {
+        private readonly IRepository<CriticalFollowValueType, Guid> _criticalFollowValueTypeRepository;
+        private readonly CacheService _cacheService;
+
+
+        public CriticalFollowValueTypeAppService(
+            IRepository<CriticalFollowValueType, Guid> criticalFollowValueTypeRepository,
+            CacheService cacheService)
+        {
+            _criticalFollowValueTypeRepository = criticalFollowValueTypeRepository;
+            _cacheService = cacheService;
+        }
+
+        /// <summary>
+        /// 根据ID查询信息
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("api/app/CriticalFollowValueType/Get")]
+        public async Task<CriticalFollowValueTypeDto> GetAsync(CriticalFollowValueTypeIdInputDto input)
+        {
+            var entity = await _criticalFollowValueTypeRepository.FindAsync(o => o.Id == input.CriticalFollowValueTypeId);
+            if (entity == null)
+                return null;
+            var entDto = ObjectMapper.Map<CriticalFollowValueType, CriticalFollowValueTypeDto>(entity);
+            entDto.CreatorName = await _cacheService.GetSurnameAsync(entDto.CreatorId);
+            entDto.LastModifierName = await _cacheService.GetSurnameAsync(entDto.LastModifierId);
+            return entDto;
+        }
+
+        ///// <summary>
+        ///// 更新
+        ///// </summary>
+        ///// <param name="input"></param>
+        ///// <returns></returns>
+        //[HttpPost("api/app/CriticalFollowValueType/Update")]
+        //public override async Task<CriticalFollowValueTypeDto> UpdateAsync(UpdateCriticalFollowValueTypeDto input)
+        //{
+        //    var entity = await Repository.GetAsync(id);
+        //    var sourceEntity = ObjectMapper.Map<UpdateItemTypeDto, ItemType>(input);
+        //    await _manager.UpdateAsync(sourceEntity, entity);
+        //    entity = await Repository.UpdateAsync(entity);
+        //    _itemTypeCache.Set(entity.Id, entity);
+        //    return ObjectMapper.Map<ItemType, ItemTypeDto>(entity);
+        //}
+        ///// <summary>
+        ///// 删除
+        ///// </summary>
+        ///// <param name="id"></param>
+        ///// <returns></returns>
+        //public override async Task DeleteAsync(Guid id)
+        //{
+        //    await _manager.CheckAndDeleteAsync(id);
+        //}
+    }
+}

src/Shentun.Peis.Application/CustomerOrgGroups/BasicCustomerOrgGroupDto.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Shentun.Peis.CustomerOrgGroups
+{
+    public class BasicCustomerOrgGroupDto
+    {
+        public Guid Id { get; set; }
+
+        /// <summary>
+        /// 分组名称
+        /// </summary>
+        public string DisplayName { get; set; }
+    }
+}

src/Shentun.Peis.Application/CustomerOrgGroups/CustomerOrgGroupAppService.cs

@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Shentun.Peis.Asbitems;
 using Shentun.Peis.CustomerOrgGroupDetails;
 using Shentun.Peis.CustomerOrgGroups;
 using Shentun.Peis.CustomerOrgRegisters;
@@ -43,6 +44,8 @@ namespace Shentun.Peis.CustomerOrgGroups
         private readonly CustomerOrgGroupManager _manager;
         private readonly CacheService _cacheService;
         private readonly CustomerOrgGroupDetailManager _customerOrgGroupDetailManager;
+        private readonly IRepository<CustomerOrg, Guid> _customerOrgRepository;
+
         public CustomerOrgGroupAppService(
             IRepository<CustomerOrgGroup, Guid> repository,
                IRepository<CustomerOrgRegister, Guid> customerOrgRegisterRepository,
@@ -50,7 +53,8 @@ namespace Shentun.Peis.CustomerOrgGroups
             IRepository<IdentityUser, Guid> userRepository,
             CustomerOrgGroupManager manager,
             CacheService cacheService,
-            CustomerOrgGroupDetailManager customerOrgGroupDetailManager)
+            CustomerOrgGroupDetailManager customerOrgGroupDetailManager,
+            IRepository<CustomerOrg, Guid> customerOrgRepository)
             : base(repository)
         {
             this._customerOrgRegisterRepository = customerOrgRegisterRepository;
@@ -59,6 +63,7 @@ namespace Shentun.Peis.CustomerOrgGroups
             _manager = manager;
             _cacheService = cacheService;
             _customerOrgGroupDetailManager = customerOrgGroupDetailManager;
+            _customerOrgRepository = customerOrgRepository;
         }
         /// <summary>
         /// 获取通过主键
@@ -158,43 +163,49 @@ namespace Shentun.Peis.CustomerOrgGroups
         [HttpPost("api/app/CustomerOrgGroup/GetListForPatentRegisterByFilter")]
         public async Task<List<CustomerOrgGroupForPatientRegisterDto>> GetListForPatentRegisterByFilterAsync(GetListDto input)
         {
-
-            var oldlist = (await Repository.GetQueryableAsync()).
-                Include(x => x.CustomerOrgRegister).
-                Include(x => x.CustomerOrgRegister.CustomerOrg).AsEnumerable();
+            var oldlist = from customerOrgGroup in await Repository.GetQueryableAsync()
+                          join customerOrgRegister in await _customerOrgRegisterRepository.GetQueryableAsync() on customerOrgGroup.CustomerOrgRegisterId equals customerOrgRegister.Id
+                          join customerOrg in await _customerOrgRepository.GetQueryableAsync() on customerOrgRegister.CustomerOrgId equals customerOrg.Id
+                          select new
+                          {
+                              customerOrgGroup,
+                              customerOrgRegister,
+                              customerOrg
+                          };
 
             if (!string.IsNullOrEmpty(input.Filter))
-                oldlist = oldlist.Where(m => m.DisplayName.Contains(input.Filter));
+                oldlist = oldlist.Where(m => m.customerOrgGroup.DisplayName.Contains(input.Filter));
 
             if (input.CustomerOrgId != null && input.CustomerOrgId != Guid.Empty)
-                oldlist = oldlist.Where(m => m.CustomerOrgRegister.CustomerOrg.Id == input.CustomerOrgId);
+                oldlist = oldlist.Where(m => m.customerOrgRegister.CustomerOrg.Id == input.CustomerOrgId);
 
             if (input.CustomerOrgRegisterId != null && input.CustomerOrgRegisterId != Guid.Empty)
-                oldlist = oldlist.Where(m => m.CustomerOrgRegisterId == input.CustomerOrgRegisterId);
+                oldlist = oldlist.Where(m => m.customerOrgGroup.CustomerOrgRegisterId == input.CustomerOrgRegisterId);
 
             if (input.MedicalTimes != null)
-                oldlist = oldlist.Where(m => m.CustomerOrgRegister.MedicalTimes == input.MedicalTimes);
+                oldlist = oldlist.Where(m => m.customerOrgRegister.MedicalTimes == input.MedicalTimes);
 
 
-            var entdto = oldlist.OrderBy(o => o.CustomerOrgRegister.CustomerOrg.DisplayOrder)
-                .ThenBy(o => o.CustomerOrgRegister.MedicalTimes)
-                 .ThenBy(o => o.DisplayOrder)
+
+            var entdto = oldlist.OrderBy(o => o.customerOrg.DisplayOrder)
+                .ThenBy(o => o.customerOrgRegister.MedicalTimes)
+                 .ThenBy(o => o.customerOrgGroup.DisplayOrder)
                 .Select(s => new CustomerOrgGroupForPatientRegisterDto
                 {
-                    Id = s.Id,
-                    DisplayName = s.DisplayName,
-                    DisplayOrder = s.DisplayOrder,
-                    Price = s.Price,
-                    ForSexId = s.ForSexId,
-                    MaritalStatusId = s.MaritalStatusId,
-                    JobTitle = s.JobTitle,
-                    JobPost = s.JobPost,
-                    AgeUpperLimit = s.AgeUpperLimit,
-                    AgeLowerLimit = s.AgeLowerLimit,
-                    CustomerOrgRegisterId = s.CustomerOrgRegisterId
+                    Id = s.customerOrgGroup.Id,
+                    DisplayName = s.customerOrgGroup.DisplayName,
+                    DisplayOrder = s.customerOrgGroup.DisplayOrder,
+                    Price = s.customerOrgGroup.Price,
+                    ForSexId = s.customerOrgGroup.ForSexId,
+                    MaritalStatusId = s.customerOrgGroup.MaritalStatusId,
+                    JobTitle = s.customerOrgGroup.JobTitle,
+                    JobPost = s.customerOrgGroup.JobPost,
+                    AgeUpperLimit = s.customerOrgGroup.AgeUpperLimit,
+                    AgeLowerLimit = s.customerOrgGroup.AgeLowerLimit,
+                    CustomerOrgRegisterId = s.customerOrgGroup.CustomerOrgRegisterId
                 }).OrderBy(m => m.DisplayOrder).ToList();
 
-
+          
             return entdto;
 
 
@@ -518,5 +529,21 @@ namespace Shentun.Peis.CustomerOrgGroups
                 throw new UserFriendlyException("上一次单位体检次数不存在");
             }
         }
+
+        /// <summary>
+        /// 获取所有单位分组列表   精简版
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("api/app/CustomerOrgGroup/GetBasicList")]
+        public async Task<List<BasicCustomerOrgGroupDto>> GetBasicListAsync()
+        {
+            var query = await Repository.GetQueryableAsync();
+            var entdto = query.OrderBy(o => o.DisplayOrder).Select(s => new BasicCustomerOrgGroupDto
+            {
+                DisplayName = s.DisplayName,
+                Id = s.Id
+            }).ToList();
+            return entdto;
+        }
     }
 }

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

@@ -458,7 +458,7 @@ namespace Shentun.Peis.PatientRegisters
         [HttpPost("api/app/patientregister/getlistinfilter")]
         public async Task<PagedResultDto<PatientRegisterOrNoDto>> GetListInFilterAsync(GetListInSearchDto input)
         {
-            var customerOrgList = await _customerOrgRepository.GetListAsync();
+            //var customerOrgList = await _customerOrgRepository.GetListAsync();
 
 
 
@@ -624,14 +624,17 @@ namespace Shentun.Peis.PatientRegisters
                 Remark3 = s.patientRegisterExterHaveEmpty != null ? s.patientRegisterExterHaveEmpty.Remark3 : null,
                 Remark4 = s.patientRegisterExterHaveEmpty != null ? s.patientRegisterExterHaveEmpty.Remark4 : null,
                 UploadQztlFlag = s.patientRegisterExterHaveEmpty != null ? s.patientRegisterExterHaveEmpty.UploadQztlFlag : null,
-                CustomerOrgName = EntityHelper.GetCustomerOrgNameNoSql(customerOrgList, s.patientRegister.CustomerOrgId),
-                CustomerOrgParentId = EntityHelper.GetParentNoSql(customerOrgList, s.patientRegister.CustomerOrgId),
-                CustomerOrgParentName = EntityHelper.GetCustomerOrgParentNameNoSql(customerOrgList, s.patientRegister.CustomerOrgId)
+                //CustomerOrgName = EntityHelper.GetCustomerOrgNameNoSql(customerOrgList, s.patientRegister.CustomerOrgId),
+                //CustomerOrgParentId = EntityHelper.GetParentNoSql(customerOrgList, s.patientRegister.CustomerOrgId),
+                //CustomerOrgParentName = EntityHelper.GetCustomerOrgParentNameNoSql(customerOrgList, s.patientRegister.CustomerOrgId)
+                CustomerOrgName = _cacheService.GetCustomerOrgNameAsync(s.patientRegister.CustomerOrgId).Result,
+                CustomerOrgParentId = _cacheService.GetTopCustomerOrgAsync(s.patientRegister.CustomerOrgId).Result.Id,
+                CustomerOrgParentName = _cacheService.GetTopCustomerOrgNameAsync(s.patientRegister.CustomerOrgId).Result
             }).ToList();
 
 
             return new PagedResultDto<PatientRegisterOrNoDto>(totalCount, entdto);
- 
+
         }
 
 

src/Shentun.Peis.Domain/CriticalFollowValueTypes/CriticalFollowValueType.cs

@@ -39,6 +39,8 @@ namespace Shentun.Peis.Models
         [Column("path_code")]
         [StringLength(50)]
         public string PathCode { get; set; } = null!;
+
+
         [Column("display_order")]
         public int DisplayOrder { get; set; }