From 137db5ac387276a95d531daacde6a97d02187895 Mon Sep 17 00:00:00 2001
From: wxd <123@qq.com>
Date: Tue, 4 Jun 2024 18:44:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=91=E5=AE=A4=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InternalReports/GetItemTypeWorkLoadInStandardDto.cs      | 5 +++++
 .../InternalReports/InternalReportAppService.cs              | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

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
         /// </summary>
         public int AsbitemCount { get; set; }
 
+        /// <summary>
+        /// 已检人次  组合项目数量
+        /// </summary>
+        public int CheckAsbitemCount { get; set; }
+
         /// <summary>
         /// 标准均价
         /// </summary>
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),