0711

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,

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';
     }
 }

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; }
     }
 }

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
             {