From 3612cdd31ee09fe64719b3c7d24288b8a26140a6 Mon Sep 17 00:00:00 2001
From: wangbo <184677810@qq.com>
Date: Tue, 2 Apr 2019 10:29:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=80=E7=B3=96=E6=8E=A5=E5=8F=A3=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/TemporaryBloodSugarController.java     |  3 ++-
 .../web/service/impl/TemporaryWeightServiceImpl.java      | 15 +++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java
index 1459c92..8c49f72 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java
@@ -11,6 +11,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
 import java.util.Date;
 
 
@@ -24,7 +25,7 @@ public class TemporaryBloodSugarController extends BaseController {
     @RequestMapping(value = "/addAndUpate", method = RequestMethod.POST)
     @TokenRequired
     @ResponseBody
-    public BaseResponse addTempraryBloodSugar(TemporaryBloodSugar bloodSugar) {
+    public BaseResponse addTempraryBloodSugar(@Valid @RequestBody TemporaryBloodSugar bloodSugar) {
 
         return bloodSugarService.addAndUpdate(bloodSugar);
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java
index 5c5ece8..ddf7b9c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java
@@ -93,7 +93,7 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo
 
     @Override
     public BaseResponse deleteTemporaryWeight(String phone) {
-        mongoTemplate.updateFirst(Query.query(Criteria.where("_id").is(phone)), Update.update("yn", 1), TemporaryWeightModel.class);
+        mongoTemplate.updateFirst(Query.query(Criteria.where("_id").is(phone)), Update.update("yn", 0), TemporaryWeightModel.class);
         return RespBuilder.buildSuccess();
     }
 
@@ -109,10 +109,10 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo
     @Override
     public BaseResponse queryAll(String key, Integer stateWeek, Integer endWeek, Integer age, Integer page, Integer limit) {
         boolean flag = false;
-        Criteria pCriteria = Criteria.where("yn").ne("0");
-        Criteria criteria = Criteria.where("yn").ne("0");
+        Criteria pCriteria = Criteria.where("yn").ne(0);
+        Criteria criteria = Criteria.where("yn").ne(0);
         if (org.apache.commons.lang.StringUtils.isNotBlank(key)) {
-            pCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("username").regex(key));
+            pCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("userName").regex(key));
             flag = true;
         }
         if (stateWeek != null && endWeek != null) {
@@ -122,15 +122,14 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo
             flag = true;
         }
         if (age != null) {
-            Date start = DateUtil.getBeforeAge(age);
-            pCriteria.and("age").is(start);
+            pCriteria.and("age").is(age);
             flag = true;
         }
         if (flag) {
-            List<TemporaryBloodModel> patients = mongoTemplate.find(Query.query(pCriteria), TemporaryBloodModel.class);
+            List<TemporaryWeightModel> patients = mongoTemplate.find(Query.query(pCriteria), TemporaryWeightModel.class);
             List<String> ids = new ArrayList<>();
             if (CollectionUtils.isNotEmpty(patients)) {
-                for (TemporaryBloodModel patient : patients) {
+                for (TemporaryWeightModel patient : patients) {
                     ids.add(patient.getId());
                 }
             }
-- 
1.8.3.1