From d69201b6aee67ca0c8ca600579112e2ac4d9316f Mon Sep 17 00:00:00 2001 From: wxd <123@qq.com> Date: Tue, 21 Apr 2026 18:02:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RegisterCheckAsbitems/RegisterCheckAsbitemAppService.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Shentun.Peis.Application/RegisterCheckAsbitems/RegisterCheckAsbitemAppService.cs b/src/Shentun.Peis.Application/RegisterCheckAsbitems/RegisterCheckAsbitemAppService.cs index 5f4e7ad8..861ccb04 100644 --- a/src/Shentun.Peis.Application/RegisterCheckAsbitems/RegisterCheckAsbitemAppService.cs +++ b/src/Shentun.Peis.Application/RegisterCheckAsbitems/RegisterCheckAsbitemAppService.cs @@ -872,6 +872,7 @@ namespace Shentun.Peis.RegisterAsbitems 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 + join itemType in await _itemTypeRepository.GetQueryableAsync() on asbitem.ItemTypeId equals itemType.Id join medicalCenter in await _organizationUnitRepository.GetQueryableAsync() on registerCheckAsbitem.MedicalCenterId equals medicalCenter.Id into medicalCenterTemp from medicalCenterHaveEmpty in medicalCenterTemp.DefaultIfEmpty() select new @@ -881,6 +882,7 @@ namespace Shentun.Peis.RegisterAsbitems registerCheck, registerCheckAsbitem, asbitem, + itemType, medicalCenterHaveEmpty }; @@ -894,7 +896,7 @@ namespace Shentun.Peis.RegisterAsbitems } - var entListDto = query.ToList().Select(s => new GetRegisterCheckAsbitemWithMedicalCenterDto + var entListDto = query.ToList().OrderBy(o => o.itemType.DisplayOrder).ThenBy(o => o.asbitem.DisplayOrder).Select(s => new GetRegisterCheckAsbitemWithMedicalCenterDto { RegisterCheckAsbitemId = s.registerCheckAsbitem.Id, AsbitemName = s.asbitem.DisplayName,