体检查询

src/Shentun.Peis.Application.Contracts/PatientRegisters/GetListInSearchDto.cs

@@ -55,6 +55,11 @@ namespace Shentun.Peis.PatientRegisters
         /// </summary>
         public string? EndDate { get; set; }
 
+        /// <summary>
+        /// 日期类型（1、登记日期   2、体检日期 ）  默认登记日期
+        /// </summary>
+        public char DateType { get; set; } = '1';
+
         /// <summary>
         /// 完成状态
         /// </summary>
@@ -75,7 +80,7 @@ namespace Shentun.Peis.PatientRegisters
         public int MaxResultCount { get; set; } = 50;
 
         public int SkipCount { get; set; } = 0;
-        
+
 
     }
 }

src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs

@@ -447,9 +447,26 @@ namespace Shentun.Peis.PatientRegisters
                 entlist = entlist.Where(m => m.patientRegister.SexId == input.SexId);
 
             if (!string.IsNullOrEmpty(input.StartDate) && !string.IsNullOrEmpty(input.EndDate))
-                entlist = entlist.Where(m => m.patientRegister.CreationTime >= Convert.ToDateTime(input.StartDate) &&
-                m.patientRegister.CreationTime < Convert.ToDateTime(input.EndDate).AddDays(1));
-
+            {
+                if (input.DateType == '1')
+                {
+                    entlist = entlist.Where(m => m.patientRegister.CreationTime >= Convert.ToDateTime(input.StartDate) &&
+                    m.patientRegister.CreationTime < Convert.ToDateTime(input.EndDate).AddDays(1));
+                }
+                else if (input.DateType == '2')
+                {
+                    entlist = entlist.Where(m => m.patientRegister.MedicalStartDate >= Convert.ToDateTime(input.StartDate) &&
+                      m.patientRegister.MedicalStartDate < Convert.ToDateTime(input.EndDate).AddDays(1));
+                }
+                else
+                {
+                    entlist = entlist.Where(m => (m.patientRegister.CreationTime >= Convert.ToDateTime(input.StartDate) &&
+                       m.patientRegister.CreationTime < Convert.ToDateTime(input.EndDate).AddDays(1))
+                       || (m.patientRegister.MedicalStartDate >= Convert.ToDateTime(input.StartDate) &&
+                      m.patientRegister.MedicalStartDate < Convert.ToDateTime(input.EndDate).AddDays(1))
+                       );
+                }
+            }
             if (input.CompleteFlag != null)
             {
                 entlist = entlist.Where(m => m.patientRegister.CompleteFlag == input.CompleteFlag);