diff --git a/platform-dal/src/main/java/com/lyms/platform/query/MicroelementQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/MicroelementQuery.java
index 9770065..a4be40f 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/MicroelementQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/MicroelementQuery.java
@@ -75,11 +75,18 @@ public class MicroelementQuery extends BaseQuery implements IConvertToNativeQuer
         Criteria c = null;
 
 
-        if (null != lastMensesStart && lastMensesEnd != null) {
+        if (null != lastMensesStart) {
             if (null != c) {
-                c = c.and("lastMenses").gte(lastMensesStart).lte(lastMensesEnd);
+                c = c.and("lastMenses").gte(lastMensesStart);
             } else {
-                c = Criteria.where("lastMenses").gte(lastMensesStart).lte(lastMensesEnd);
+                c = Criteria.where("lastMenses").gte(lastMensesStart);
+            }
+        }
+        if (null != lastMensesEnd) {
+            if (c != null) {
+                c = c.lte(lastMensesEnd);
+            } else {
+                c = Criteria.where("lastMenses").lte(lastMensesEnd);
             }
         }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MicroelementFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MicroelementFacade.java
index 2080865..e3f814e 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MicroelementFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MicroelementFacade.java
@@ -109,10 +109,10 @@ public class MicroelementFacade {
 
             //孕周
             if (start != null && end != null) {
-                Date start1   = DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(end * 7) - 6);
-                Date end1 = DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(start * 7));
+                Date endDate = DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(start * 7));
+                Date start1 = DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(end * 7) - 6);
                 query.setLastMensesStart(start1);
-                query.setLastMensesEnd(end1);
+                query.setLastMensesEnd(endDate);
             }
 
             System.out.println(query.convertToQuery().convertToMongoQuery().toString());