From 61dc3df02c8bd994853661d5dc766addf1b06c2d Mon Sep 17 00:00:00 2001
From: wxd <123@qq.com>
Date: Thu, 30 May 2024 23:49:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../GetPatientRegisterReportDto.cs            | 16 ++++++++++++
 .../InternalReportAppService.cs               |  2 +-
 .../PeisReports/PeisReportAppService.cs       | 25 ++++++++-----------
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/Shentun.Peis.Application.Contracts/PeisReports/GetPatientRegisterReportDto.cs b/src/Shentun.Peis.Application.Contracts/PeisReports/GetPatientRegisterReportDto.cs
index 837953e..7b5d194 100644
--- a/src/Shentun.Peis.Application.Contracts/PeisReports/GetPatientRegisterReportDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/PeisReports/GetPatientRegisterReportDto.cs
@@ -118,5 +118,21 @@ namespace Shentun.Peis.PeisReports
         /// 是否为职业病
         /// </summary>
         public char IsPatientOccupationalDisease { get; set; } = 'N';
+
+        /// <summary>
+        /// 婚姻状况名称
+        /// </summary>
+        public string MaritalStatusName { get; set; }
+
+
+        /// <summary>
+        /// 登记人
+        /// </summary>
+        public string RegisterName { get; set; }
+
+        /// <summary>
+        /// 登记日期
+        /// </summary>
+        public string RegisterDate { get; set; }
     }
 }
diff --git a/src/Shentun.Peis.Application/InternalReports/InternalReportAppService.cs b/src/Shentun.Peis.Application/InternalReports/InternalReportAppService.cs
index e6f9f32..220d727 100644
--- a/src/Shentun.Peis.Application/InternalReports/InternalReportAppService.cs
+++ b/src/Shentun.Peis.Application/InternalReports/InternalReportAppService.cs
@@ -260,7 +260,7 @@ namespace Shentun.Peis.InternalReports
                 qeruy = qeruy.Where(m => m.MedicalTypeId != null && input.MedicalTypeIds.Contains(m.MedicalTypeId.Value));
             }
 
-            var entlist = qeruy.GroupBy(g => new { g.ItemTypeId, g.AsbitemId })
+            var entlist = qeruy.ToList().GroupBy(g => new { g.ItemTypeId, g.AsbitemId })
                 .Select(s => new GetItemTypeWorkLoadInStandardDto
                 {
                     AsbitemName = s.First().AsbitemName,
diff --git a/src/Shentun.Peis.Application/PeisReports/PeisReportAppService.cs b/src/Shentun.Peis.Application/PeisReports/PeisReportAppService.cs
index f01c04a..e5e7a60 100644
--- a/src/Shentun.Peis.Application/PeisReports/PeisReportAppService.cs
+++ b/src/Shentun.Peis.Application/PeisReports/PeisReportAppService.cs
@@ -89,12 +89,6 @@ namespace Shentun.Peis.PeisReports
                         from ac in cc.DefaultIfEmpty()
                         join d in await _medicalPackageRepository.GetQueryableAsync() on a.MedicalPackageId equals d.Id into dd
                         from ad in dd.DefaultIfEmpty()
-                        join e in await _medicalTypeRepository.GetQueryableAsync() on a.MedicalTypeId equals e.Id into ee
-                        from ae in ee.DefaultIfEmpty()
-                        join f in await _personnelTypeRepository.GetQueryableAsync() on a.PersonnelTypeId equals f.Id into ff
-                        from af in ff.DefaultIfEmpty()
-                        join g in await _sexRepository.GetQueryableAsync() on a.SexId equals g.Id into gg
-                        from ag in gg.DefaultIfEmpty()
                         orderby a.Id ascending
                         select new
                         {
@@ -116,16 +110,16 @@ namespace Shentun.Peis.PeisReports
                                 a.ReportPrintTimes,
                                 a.MedicalTypeId,
                                 a.PersonnelTypeId,
-                                a.IsUpload
+                                a.IsUpload,
+                                a.SexId,
+                                a.CreatorId,
+                                a.MaritalStatusId
                             },
                             RegisterCheckCompleteFlag = registerCheck.CompleteFlag,
                             IsCheck = asbitem.IsCheck,
                             ab = new { ab.IdNo, ab.Address, ab.PatientNo, ab.MobileTelephone, ab.Telephone, ab.Email, ab.DisplayName },
                             ac = new { ac.DisplayName },
-                            ad = new { ad.DisplayName },
-                            ae = new { ae.DisplayName },
-                            af = new { af.DisplayName },
-                            ag = new { ag.DisplayName },
+                            ad = new { ad.DisplayName }
                         };
 
 
@@ -338,14 +332,17 @@ namespace Shentun.Peis.PeisReports
                         IsAudit = s.FirstOrDefault().a.IsAudit,
                         IsReportPrint = s.FirstOrDefault().a.ReportPrintTimes > 0 ? 'Y' : 'N',
                         MedicalPackageName = s.FirstOrDefault().ad.DisplayName,
-                        MedicalTypeName = s.FirstOrDefault().ae.DisplayName,
+                        MedicalTypeName = _cacheService.GetMedicalTypeNameAsync(s.FirstOrDefault().a.MedicalTypeId).Result,
                         MobileTelephone = s.FirstOrDefault().ab.MobileTelephone,
                         PatientNo = s.FirstOrDefault().ab.PatientNo,
                         PatientRegisterNo = s.FirstOrDefault().a.PatientRegisterNo,
-                        PersonnelTypeName = s.FirstOrDefault().af.DisplayName,
-                        SexName = s.FirstOrDefault().ag.DisplayName,
+                        PersonnelTypeName = _cacheService.GetPersonnelTypeNameAsync(s.FirstOrDefault().a.PersonnelTypeId).Result,
+                        SexName = _cacheService.GetSexNameAsync(s.FirstOrDefault().a.SexId).Result,
                         Telephone = s.FirstOrDefault().ab.Telephone,
                         PatientRegisterId = s.FirstOrDefault().a.Id,
+                        MaritalStatusName = _cacheService.GetMaritalStatusNameAsync(s.FirstOrDefault().a.MaritalStatusId).Result,
+                        RegisterName = _cacheService.GetSurnameAsync(s.FirstOrDefault().a.CreatorId).Result,
+                        RegisterDate = DataHelper.ConversionDateToString(s.FirstOrDefault().a.CreationTime),
                         IsPatientOccupationalDisease = _patientOccupationalDiseaseManager.GetPatientRegisterIsOccupationalDisease(s.FirstOrDefault().a.Id).Result
                     });
                 }