From 219d685e7c52021e754ae41e9168b09d27c8d7d1 Mon Sep 17 00:00:00 2001
From: wxd <123@qq.com>
Date: Thu, 11 Jul 2024 20:08:43 +0800
Subject: [PATCH] 0711

---
 .../WebAppoints/WebAppointWebPeisPlugIns.cs            |  2 +-
 ...CustomerOrgPhysicalExaminationStatisticsInputDto.cs |  5 +++++
 .../ImportLisResults/CreateImportLisResultDto.cs       | 10 ++++++++++
 .../CustomerReports/CustomerReportAppService.cs        |  7 ++++++-
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/Shentun.ColumnReferencePlugIns/WebAppoints/WebAppointWebPeisPlugIns.cs b/src/Shentun.ColumnReferencePlugIns/WebAppoints/WebAppointWebPeisPlugIns.cs
index 270f2c7..ade7785 100644
--- a/src/Shentun.ColumnReferencePlugIns/WebAppoints/WebAppointWebPeisPlugIns.cs
+++ b/src/Shentun.ColumnReferencePlugIns/WebAppoints/WebAppointWebPeisPlugIns.cs
@@ -121,7 +121,7 @@ namespace Shentun.Peis.PlugIns.WebAppoints
                     SELECT 
 			        id
 			        from patient_register
-                    where summary_date >= @HandDate and 
+                    where last_modification_time >= @HandDate and 
                           complete_flag = @CompleteFlag
                      ";
                 var patientRegisterIds = (await conn.QueryAsync<SyncPatientRegisterIdsDto>(sql,
diff --git a/src/Shentun.Peis.Application.Contracts/CustomerReports/GetCustomerOrgPhysicalExaminationStatisticsInputDto.cs b/src/Shentun.Peis.Application.Contracts/CustomerReports/GetCustomerOrgPhysicalExaminationStatisticsInputDto.cs
index 547476a..14d721f 100644
--- a/src/Shentun.Peis.Application.Contracts/CustomerReports/GetCustomerOrgPhysicalExaminationStatisticsInputDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/CustomerReports/GetCustomerOrgPhysicalExaminationStatisticsInputDto.cs
@@ -27,5 +27,10 @@ namespace Shentun.Peis.CustomerReports
         /// </summary>
         [Required(ErrorMessage = "结束日期不能为空")]
         public string EndDate { get; set; }
+
+        /// <summary>
+        /// 是否需要统计预登记  默认为N 不统计  需要统计传Y
+        /// </summary>
+        public char IsPreRegistration { get; set; }= 'N';
     }
 }
diff --git a/src/Shentun.Peis.Application.Contracts/ImportLisResults/CreateImportLisResultDto.cs b/src/Shentun.Peis.Application.Contracts/ImportLisResults/CreateImportLisResultDto.cs
index f26796a..d0c00a9 100644
--- a/src/Shentun.Peis.Application.Contracts/ImportLisResults/CreateImportLisResultDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/ImportLisResults/CreateImportLisResultDto.cs
@@ -60,5 +60,15 @@ namespace Shentun.Peis.ImportLisResults
         public DateTime? CheckDate { get; set; }
 
         public Guid ExecOrganizationUnitId { get; set; }
+
+        /// <summary>
+        /// lis审核医生
+        /// </summary>
+        public string LisAuditorDoctorName { get; set; }
+
+        /// <summary>
+        /// lis标本号
+        /// </summary>
+        public string LisSampleNo { get; set; }
     }
 }
diff --git a/src/Shentun.Peis.Application/CustomerReports/CustomerReportAppService.cs b/src/Shentun.Peis.Application/CustomerReports/CustomerReportAppService.cs
index 85c418b..6ce39dd 100644
--- a/src/Shentun.Peis.Application/CustomerReports/CustomerReportAppService.cs
+++ b/src/Shentun.Peis.Application/CustomerReports/CustomerReportAppService.cs
@@ -2329,6 +2329,11 @@ namespace Shentun.Peis.CustomerReports
                 qeruy = qeruy.Where(m => CustomerOrgIds.Contains(m.patientRegister.CustomerOrgId));
             }
 
+            if (input.IsPreRegistration == 'N')
+            {
+                qeruy = qeruy.Where(m => m.patientRegister.CompleteFlag != PatientRegisterCompleteFlag.PreRegistration);
+            }
+
             if (!string.IsNullOrEmpty(input.StartDate) && !string.IsNullOrEmpty(input.EndDate))
             {
                 if (input.DateType == '1')
@@ -2348,7 +2353,7 @@ namespace Shentun.Peis.CustomerReports
                 }
             }
 
- 
+
             var patientRegisterGroup = qeruy.ToList().GroupBy(g => g.patientRegister.Id);
             var patientRegisterGroupList = patientRegisterGroup.Select(s => new GetCustomerOrgPhysicalExaminationStatisticsPatientRegisterGroupDto
             {