From 9dddc210de1625499954f73a432d21d23b39300f Mon Sep 17 00:00:00 2001 From: wxd <123@qq.com> Date: Mon, 29 Apr 2024 01:10:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=93=E6=A3=80=E6=8A=A5=E5=91=8A=E3=80=81?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PatientRegisters/PatientRegisterAppService.cs | 2 +- .../PrintReports/PrintReportAppService.cs | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs b/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs index e0099c0..eb9d39e 100644 --- a/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs +++ b/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs @@ -401,7 +401,7 @@ namespace Shentun.Peis.PatientRegisters int totalCount = entlist.Count(); - entlist = entlist.Skip(input.SkipCount * input.MaxResultCount).Take(input.MaxResultCount); + entlist = entlist.OrderBy(o => o.Id).Skip(input.SkipCount * input.MaxResultCount).Take(input.MaxResultCount); var entdto = entlist.Select(s => new PatientRegisterOrNoDto diff --git a/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs b/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs index 94e0353..f815a1b 100644 --- a/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs +++ b/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs @@ -600,10 +600,15 @@ namespace Shentun.Peis.PrintReports medicalReportRegisterCheckDto.Items.Add(medicalReportCheckItemDto); } //小结 - medicalReportRegisterCheckDto.Summarys = registerCheckRows.Select(o => new MedicalReportCheckAsbitemSummaryDto() + //medicalReportRegisterCheckDto.Summarys = registerCheckRows.Select(o => new MedicalReportCheckAsbitemSummaryDto() + //{ + // Summary = o.registerCheckSummaryHaveEmpty.Summary, + // DisplayOrder = o.registerCheckSummaryHaveEmpty.DisplayOrder + //}).OrderBy(o => o.DisplayOrder).Distinct().ToList(); + medicalReportRegisterCheckDto.Summarys = registerCheckRows.GroupBy(g=>g.registerCheckSummaryHaveEmpty.Id).Select(o => new MedicalReportCheckAsbitemSummaryDto() { - Summary = o.registerCheckSummaryHaveEmpty.Summary, - DisplayOrder = o.registerCheckSummaryHaveEmpty.DisplayOrder + Summary = o.FirstOrDefault().registerCheckSummaryHaveEmpty.Summary, + DisplayOrder = o.FirstOrDefault().registerCheckSummaryHaveEmpty.DisplayOrder }).OrderBy(o => o.DisplayOrder).Distinct().ToList(); //图片 var registerCheckPictures = registerCheckRows.Where(o => o.registerCheckPictureHaveEmpty != null &&