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
/////
//public char IsPicture { get; set; } = 'N';
+
+ ///
+ /// 体检类别
+ ///
+ public List MedicalTypeIds { get; set; } = new List();
+
+
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 Asbitems { get; set; } = new List();
+
+
+ ///
+ /// 体检类别
+ ///
+ public List MedicalTypeIds { get; set; } = new List();
+
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);