diff --git a/src/Shentun.Peis.Application.Contracts/InternalReports/GetItemTypeWorkLoadInStandardDto.cs b/src/Shentun.Peis.Application.Contracts/InternalReports/GetItemTypeWorkLoadInStandardDto.cs
index f817f3be..db1854f4 100644
--- a/src/Shentun.Peis.Application.Contracts/InternalReports/GetItemTypeWorkLoadInStandardDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/InternalReports/GetItemTypeWorkLoadInStandardDto.cs
@@ -21,6 +21,11 @@ namespace Shentun.Peis.InternalReports
///
public int AsbitemCount { get; set; }
+ ///
+ /// 已检人次 组合项目数量
+ ///
+ public int CheckAsbitemCount { get; set; }
+
///
/// 标准均价
///
diff --git a/src/Shentun.Peis.Application/InternalReports/InternalReportAppService.cs b/src/Shentun.Peis.Application/InternalReports/InternalReportAppService.cs
index 220d7277..ab9302a9 100644
--- a/src/Shentun.Peis.Application/InternalReports/InternalReportAppService.cs
+++ b/src/Shentun.Peis.Application/InternalReports/InternalReportAppService.cs
@@ -231,7 +231,7 @@ namespace Shentun.Peis.InternalReports
join c in await _itemTypeRepository.GetQueryableAsync() on b.ItemTypeId equals c.Id
join d in await _registerCheckRepository.GetQueryableAsync() on a.RegisterCheckId equals d.Id
join patientRegister in await _patientRegisterRepository.GetQueryableAsync() on d.PatientRegisterId equals patientRegister.Id
- where (!string.IsNullOrEmpty(d.CheckDoctorId) && d.CheckDate != null)
+ //where (!string.IsNullOrEmpty(d.CheckDoctorId) && d.CheckDate != null)
select new
{
a.AsbitemId,
@@ -242,6 +242,7 @@ namespace Shentun.Peis.InternalReports
ItemTypeId = b.ItemTypeId,
ItemTypeName = c.DisplayName,
d.CheckDate,
+ d.CheckDoctorId,
MedicalTypeId = patientRegister.MedicalTypeId
};
@@ -264,6 +265,7 @@ namespace Shentun.Peis.InternalReports
.Select(s => new GetItemTypeWorkLoadInStandardDto
{
AsbitemName = s.First().AsbitemName,
+ CheckAsbitemCount = s.Where(m => !string.IsNullOrEmpty(m.CheckDoctorId) && m.CheckDate != null).Count(),
AsbitemCount = s.Count(),
ItemTypeName = s.First().ItemTypeName,
AvgChargePrice = Math.Round(s.Average(v => v.ChargePrice), 2),