Fix Bug กรองวันที่

BMA.EHR.Discipline.Service/Controllers/DisciplineComplaintController.cs

@@ -148,13 +148,13 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
                     .Where(x =>
                         (!req.dateReceivedStart.HasValue || !req.dateReceivedEnd.HasValue ||
                          (x.DateReceived.HasValue &&
-                          x.DateReceived.Value.Date >= req.dateReceivedStart.Value.Date &&
+                          x.DateReceived.Value.Date <= req.dateReceivedStart.Value.Date &&
-                          x.DateReceived.Value.Date <= req.dateReceivedEnd.Value.Date))
+                          x.DateReceived.Value.Date >= req.dateReceivedEnd.Value.Date))
                         &&
                         (!req.dateConsiderationStart.HasValue || !req.dateConsiderationEnd.HasValue ||
                          (x.DateConsideration.HasValue &&
-                          x.DateConsideration.Value.Date >= req.dateConsiderationStart.Value.Date &&
+                          x.DateConsideration.Value.Date <= req.dateConsiderationStart.Value.Date &&
-                          x.DateConsideration.Value.Date <= req.dateConsiderationEnd.Value.Date))
+                          x.DateConsideration.Value.Date >= req.dateConsiderationEnd.Value.Date))
                         &&
                         (string.IsNullOrEmpty(req.respondentType) || x.RespondentType == req.respondentType)
                         &&

BMA.EHR.Discipline.Service/Controllers/DisciplineDisciplinaryController.cs

@@ -145,14 +145,14 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
                         //วันที่รับเรือง
                         (!req.dateReceivedStart.HasValue || !req.dateReceivedEnd.HasValue ||
                          (x.DateReceived.HasValue &&
-                          x.DateReceived.Value.Date >= req.dateReceivedStart.Value.Date &&
+                          x.DateReceived.Value.Date <= req.dateReceivedStart.Value.Date &&
-                          x.DateReceived.Value.Date <= req.dateReceivedEnd.Value.Date))
+                          x.DateReceived.Value.Date >= req.dateReceivedEnd.Value.Date))
                         &&
                         //วันที่สอบสวน
                         (!req.disciplinaryDateStart.HasValue || !req.disciplinaryDateEnd.HasValue ||
                          (x.DisciplinaryDateStart.HasValue && x.DisciplinaryDateEnd.HasValue &&
-                          x.DisciplinaryDateStart.Value.Date >= req.disciplinaryDateStart.Value.Date &&
+                          x.DisciplinaryDateStart.Value.Date <= req.disciplinaryDateStart.Value.Date &&
-                          x.DisciplinaryDateEnd.Value.Date <= req.disciplinaryDateEnd.Value.Date))
+                          x.DisciplinaryDateEnd.Value.Date >= req.disciplinaryDateEnd.Value.Date))
                         &&
                         (string.IsNullOrEmpty(req.respondentType) || x.RespondentType == req.respondentType)
                         &&

BMA.EHR.Discipline.Service/Controllers/DisciplineInvestigateController.cs

@@ -141,13 +141,13 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
                     .Where(x =>
                         (!req.dateReceivedStart.HasValue || !req.dateReceivedEnd.HasValue ||
                          (x.DateReceived.HasValue &&
-                          x.DateReceived.Value.Date >= req.dateReceivedStart.Value.Date &&
+                          x.DateReceived.Value.Date <= req.dateReceivedStart.Value.Date &&
-                          x.DateReceived.Value.Date <= req.dateReceivedEnd.Value.Date))
+                          x.DateReceived.Value.Date >= req.dateReceivedEnd.Value.Date))
                         &&
                         (!req.investigationDateStart.HasValue || !req.investigationDateEnd.HasValue ||
-                         (x.DateConsideration.HasValue &&
+                         (x.InvestigationDateStart.HasValue && x.InvestigationDateEnd.HasValue &&
-                          x.DateConsideration.Value.Date >= req.investigationDateStart.Value.Date &&
+                          x.InvestigationDateStart.Value.Date <= req.investigationDateStart.Value.Date &&
-                          x.DateConsideration.Value.Date <= req.investigationDateEnd.Value.Date))
+                          x.InvestigationDateEnd.Value.Date >= req.investigationDateEnd.Value.Date))
                         &&
                         (string.IsNullOrEmpty(req.respondentType) || x.RespondentType == req.respondentType)
                         &&
@@ -168,8 +168,9 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
                                 RespondentType = x.RespondentType,//ผู้ถูกสืบสวน
                                 OffenseDetails = x.OffenseDetails,//ลักษณะความผิด
                                 Status = x.Status,//สถานะหรือผลการสืบสวน
-                                InvestigationDateStart = x.InvestigationDateStart,
+                                InvestigationDateStart = x.InvestigationDateStart, //วันที่เริ่มการสืบสวน
-                                InvestigationDateEnd = x.InvestigationDateEnd,
+                                InvestigationDateEnd = x.InvestigationDateEnd, //วันที่สิ้นสุดการสืบสวน
+                                DateReceived = x.DateReceived, //วันที่รับเรื่อง
                                 CreatedAt = x.CreatedAt,//วันที่สร้างเรื่องสืบสวน
                                 InvestigationDetail = x.InvestigationDetail,
                                 InvestigationStatusResult = x.InvestigationStatusResult,

BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs

@@ -170,8 +170,8 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
                     .Where(x =>
                         (!req.disciplinaryDateStart.HasValue || !req.disciplinaryDateEnd.HasValue ||
                          (x.DisciplinaryDateStart.HasValue && x.DisciplinaryDateEnd.HasValue &&
-                          x.DisciplinaryDateStart.Value.Date >= req.disciplinaryDateStart.Value.Date &&
+                          x.DisciplinaryDateStart.Value.Date <= req.disciplinaryDateStart.Value.Date &&
-                          x.DisciplinaryDateEnd.Value.Date <= req.disciplinaryDateEnd.Value.Date))
+                          x.DisciplinaryDateEnd.Value.Date >= req.disciplinaryDateEnd.Value.Date))
                         &&
                         (string.IsNullOrEmpty(req.respondentType) || x.RespondentType == req.respondentType)
                         &&