From 7fe5e20d6a874c35d48d040f7d530cf90f307b38 Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Thu, 2 Nov 2017 18:46:48 +0800
Subject: [PATCH] bug

---
 .../web/service/impl/PatientWeightServiceImpl.java | 17 +++++++------
 .../web/service/impl/ReportServiceImpl.java        | 29 ++++++++++++++++++++--
 2 files changed, 37 insertions(+), 9 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 c8ddfa5..0b559f8 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
@@ -434,12 +434,16 @@ 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.isNotEmpty(nowWeight)) {
+            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);
+            patientWeight.setDayWeights2(dayWeights2);
+        }
+
         dayWeights.put(DateUtil.getyyyy_MM_dd(new Date()), nowWeight);
         patientWeight.setCreated(new Date());
         patientWeight.setHospitalId(patients.getHospitalId());
@@ -448,7 +452,6 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient
         }
         patientWeight.setYn("1");
         patientWeight.setPid(patients.getPid());
-        patientWeight.setDayWeights2(dayWeights2);
         patientWeight.setDayWeights(dayWeights);
         patientWeight.setId(null);
         patientWeightService2.add(patientWeight);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
index 9116fe9..b75f174 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
@@ -30,7 +30,6 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
-import scala.annotation.target.param;
 
 import javax.servlet.http.HttpServletResponse;
 import java.sql.PreparedStatement;
@@ -597,7 +596,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
                         map.put("hospitalName", couponMapper.findHospitalNameById(patient.getHospitalId()));
                     }
                 }
-                map.put("checkTime", "2017-02-22");
+                 map.put("checkTime", getCheckTime((String) map.get("type"), (String) map.get("user_id")));
                 restList.add(map);
             }
             Integer count = couponMapper.findUnUsedInfoCount(CollectionUtils.createMap("userIds", userIds));
@@ -606,6 +605,32 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
         return RespBuilder.buildSuccess(new PageResult(0, page, limit, null));
     }
 
+    /**
+     * type
+     * 1=孕妇建档   lyms_patient
+     * 2=孕妇产检   lyms_antexc（初诊），lyms_antex（复诊）
+     * 3=产妇建档   lyms_patient
+     * 4=产妇分娩   lyms_matdeliver
+     * 5=产妇出院小结	lyms_discharge_abstract_mother
+     * 6=产妇产后复查	lyms_postreview
+     * 7=儿童建档	lyms_baby
+     * 8=儿童保健	lyms_babycheck
+     */
+    private String getCheckTime(String type, String userId) {
+        if(StringUtils.isNotEmpty(type) && StringUtils.isNotEmpty(userId)) {
+            if("1".equals(type)) {
+                Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("").is(userId)).with(new Sort(Sort.Direction.DESC, "created")), Patients.class);
+                if(patients != null && patients.getBookbuildingDate() != null) {
+                    return DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate());
+                }
+            } else if("2".equals(type)) {
+
+            }
+        }
+
+        return "";
+    }
+
     @Override
     public BaseObjectResponse unUsed(Date startDate, Date endDate, String provinceId, String cityId, String areaId, String hospitalId, Integer page, Integer limit, Integer userId) {
         List<String> hospitalIds = getHospitalIds(userId, hospitalId);
-- 
1.8.3.1