From bf8f469ffd6e10c79e3d7fbdacb3d68358ae6a78 Mon Sep 17 00:00:00 2001
From: wxd <123@qq.com>
Date: Mon, 3 Jun 2024 18:16:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0=E4=BD=93?=
 =?UTF-8?q?=E6=A3=80=E7=B1=BB=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PatientRegisters/DoctorPeisRecordListInputDto.cs      | 7 +++++++
 .../PatientRegisters/SumDoctorPeisRecordListInputtDto.cs  | 7 +++++++
 .../PatientRegisters/PatientRegisterAppService.cs         | 8 ++++++++
 3 files changed, 22 insertions(+)

diff --git a/src/Shentun.Peis.Application.Contracts/PatientRegisters/DoctorPeisRecordListInputDto.cs b/src/Shentun.Peis.Application.Contracts/PatientRegisters/DoctorPeisRecordListInputDto.cs
index 2c19086..4ec3da3 100644
--- a/src/Shentun.Peis.Application.Contracts/PatientRegisters/DoctorPeisRecordListInputDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/PatientRegisters/DoctorPeisRecordListInputDto.cs
@@ -56,6 +56,13 @@ namespace Shentun.Peis.PatientRegisters
         ///// </summary>
         //public char IsPicture { get; set; } = 'N';
 
+
+        /// <summary>
+        /// 体检类别
+        /// </summary>
+        public List<Guid> MedicalTypeIds { get; set; } = new List<Guid>();
+
+
         public override int MaxResultCount { get; set; } = 100;
     }
 }
diff --git a/src/Shentun.Peis.Application.Contracts/PatientRegisters/SumDoctorPeisRecordListInputtDto.cs b/src/Shentun.Peis.Application.Contracts/PatientRegisters/SumDoctorPeisRecordListInputtDto.cs
index 83bfbe1..234da08 100644
--- a/src/Shentun.Peis.Application.Contracts/PatientRegisters/SumDoctorPeisRecordListInputtDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/PatientRegisters/SumDoctorPeisRecordListInputtDto.cs
@@ -57,6 +57,13 @@ namespace Shentun.Peis.PatientRegisters
         public List<Guid> Asbitems { get; set; } = new List<Guid>();
 
 
+
+
+        /// <summary>
+        /// 体检类别
+        /// </summary>
+        public List<Guid> MedicalTypeIds { get; set; } = new List<Guid>();
+
         public override int MaxResultCount { get; set; } = 100;
     }
 }
diff --git a/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs b/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs
index 3c42d4b..8f0ace2 100644
--- a/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs
+++ b/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs
@@ -1509,6 +1509,10 @@ namespace Shentun.Peis.PatientRegisters
                 sumquery = sumquery.Where(m => m.RegisterCheckIsAudit == input.AsbitemIsAudit);
             }
 
+            if (input.MedicalTypeIds.Any())
+            {
+                sumquery = sumquery.Where(m => m.a.MedicalTypeId != null && input.MedicalTypeIds.Contains(m.a.MedicalTypeId.Value));
+            }
 
 
             #region 增加项目类别权限
@@ -1787,6 +1791,10 @@ namespace Shentun.Peis.PatientRegisters
                 sumquery = sumquery.Where(m => m.RegisterCheckIsAudit == input.AsbitemIsAudit);
             }
 
+            if (input.MedicalTypeIds.Any())
+            {
+                sumquery = sumquery.Where(m => m.a.MedicalTypeId != null && input.MedicalTypeIds.Contains(m.a.MedicalTypeId.Value));
+            }
 
             var sumqueryGroup = sumquery.ToList().GroupBy(g => g.a.Id);