体检报告、人员列表排序

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

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 &&