From 8f9cdf820a56282eb56ffffb32ef32b90e419ce0 Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Thu, 2 Nov 2017 15:43:05 +0800
Subject: [PATCH] bug

---
 .../web/service/impl/PatientWeightServiceImpl.java | 46 ++++++++++------------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java
index a6feda3..c8ddfa5 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java
@@ -379,7 +379,8 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient
     public BaseResponse wxAddOrUpdate(PatientWeight patientWeight) {
         String nowWeight = patientWeight.getNowWeight();
         Patients patients = mongoTemplate.findById(patientWeight.getPatientId(), Patients.class);
-        PatientWeight pw = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(patientWeight.getPid())), PatientWeight.class);
+//        PatientWeight pw = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(patientWeight.getPid())), PatientWeight.class);
+        PatientWeight pw = mongoTemplate.findOne(Query.query(Criteria.where("patientId").is(patientWeight.getPatientId())), PatientWeight.class);
         Map<String, String> dayWeights = new LinkedHashMap<>();
         List<Map<String, Object>> dayWeights2 = new ArrayList<>();
         String ymdDate = DateUtil.getyyyy_MM_dd(new Date());
@@ -391,6 +392,9 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient
         if(pw != null && StringUtils.isNotEmpty(patientWeight.getBeforeWeight())) {
             return RespBuilder.buildErro(ResponseCode.PATIENT_WEIGHT_IS_EXIST);
         }
+        if(patients == null) {
+            return RespBuilder.buildSuccess("patients未找到，patientWeight>>> " + patientWeight);
+        }
         if(pw != null) { // 修改
             if(MapUtils.isNotEmpty(pw.getDayWeights())) {
                 dayWeights = pw.getDayWeights();
@@ -430,36 +434,26 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient
             return RespBuilder.buildSuccess(pw);
         }
 
-
         Map<String, Object> m = new HashMap<>();
         m.put("hospitalId", hospitalId);
         m.put("hospitalName", couponMapper.getHospitalName(hospitalId));
         m.put("date", ymdDate);
         m.put("nowWeight", nowWeight);
         dayWeights2.add(m);
-        if(StringUtils.isEmpty(patientWeight.getId()) && patients != null) {
-            patientWeight.setCreated(new Date());
-            patientWeight.setHospitalId(patients.getHospitalId());
-            if(StringUtils.isNotBlank(patientWeight.getBeforeWeight()) && patientWeight.getBeforeHeight() != null) {
-                patientWeight.setBmi(getBmi(patientWeight.getBeforeWeight(), patientWeight.getBeforeHeight()));
-            }
-            patientWeight.setYn("1");
-            patientWeight.setPid(patients.getPid());
-            pw.setDayWeights2(dayWeights2);
-            patientWeightService2.add(patientWeight);
-            return RespBuilder.buildSuccess(patientWeight);
-        } else {
-            patientWeight.setCreated(new Date());
-            patientWeight.setHospitalId(patients.getHospitalId());
-            if(StringUtils.isNotBlank(patientWeight.getBeforeWeight()) && patientWeight.getBeforeHeight() != null) {
-                patientWeight.setBmi(getBmi(patientWeight.getBeforeWeight(), patientWeight.getBeforeHeight()));
-            }
-            patientWeight.setYn("1");
-            patientWeight.setPid(patients.getPid());
-            pw.setDayWeights2(dayWeights2);
-            patientWeightService2.add(patientWeight);
-            return RespBuilder.buildSuccess(patientWeight);
+        dayWeights.put(DateUtil.getyyyy_MM_dd(new Date()), nowWeight);
+        patientWeight.setCreated(new Date());
+        patientWeight.setHospitalId(patients.getHospitalId());
+        if(StringUtils.isNotBlank(patientWeight.getBeforeWeight()) && patientWeight.getBeforeHeight() != null) {
+            patientWeight.setBmi(getBmi(patientWeight.getBeforeWeight(), patientWeight.getBeforeHeight()));
         }
+        patientWeight.setYn("1");
+        patientWeight.setPid(patients.getPid());
+        patientWeight.setDayWeights2(dayWeights2);
+        patientWeight.setDayWeights(dayWeights);
+        patientWeight.setId(null);
+        patientWeightService2.add(patientWeight);
+        return RespBuilder.buildSuccess(patientWeight);
+
     }
 
     @Override
@@ -474,7 +468,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient
         patientWeight.setDayWeights(map);
 
         JSONArray dayWeights2 = JSONArray.fromObject(patientWeight.getDayWeights2Json());
-        List<Map<String, Object>> dayWeights2List = new ArrayList<>();
+        /*List<Map<String, Object>> dayWeights2List = new ArrayList<>();
         Iterator iterator = dayWeights2.iterator();
         while (iterator.hasNext()) {
             JSONObject jsonObject = JSONObject.fromObject(iterator.next().toString());
@@ -484,7 +478,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient
             temp.put("date", jsonObject.getString("date"));
             temp.put("nowWeight", jsonObject.getString("nowWeight"));
             dayWeights2List.add(temp);
-        }
+        }*/
 
         patientWeight.setDayWeigthsJson(null);
         patientWeight.setDayWeights2Json(null);
-- 
1.8.3.1