Polyclinic/PolyclinicDatabaseImplement/Implements/DiagnoseStorage.cs

@@ -50,11 +50,18 @@ namespace PolyclinicDatabaseImplement.Implements
             }
             if (model.To != null)
             {
-                elements = elements
-                    .Where(x => x.DateStartDiagnose <= model.To.Value)
+                elements = elements.Where(x => x.DateStartDiagnose <= model.To.Value).ToList();
+
+                var elemWithDateStop = elements
                     .Where(x => x.DateStopDiagnose != null)
                     .Where(x => x.DateStopDiagnose <= model.To.Value)
                     .ToList();
+
+                var elemWithoutDateStop = elements.Where(x => x.DateStopDiagnose == null).ToList();
+
+                elemWithDateStop.AddRange(elemWithoutDateStop);
+
+                elements = elemWithDateStop;
             }
             return elements;
         }