From cfb1f946fd039daac2cd532936a4da27ddf83b1f Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Thu, 2 Nov 2017 19:19:08 +0800
Subject: [PATCH] bug

---
 .../web/service/impl/PatientWeightServiceImpl.java |  2 +-
 .../web/service/impl/ReportServiceImpl.java        | 42 +++++++++++++++++++---
 2 files changed, 38 insertions(+), 6 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 0b559f8..b863b42 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
@@ -442,9 +442,9 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient
             m.put("nowWeight", nowWeight);
             dayWeights2.add(m);
             patientWeight.setDayWeights2(dayWeights2);
+            dayWeights.put(DateUtil.getyyyy_MM_dd(new Date()), nowWeight);
         }
 
-        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) {
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 b75f174..5508a9a 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
@@ -618,13 +618,45 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
      */
     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());
+            if("1".equals(type) || "3".equals(type)) {
+                Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)).with(new Sort(Sort.Direction.DESC, "created")), Patients.class);
+                if(patients != null) {
+                    return DateUtil.getyyyy_MM_dd(patients.getCreated());
                 }
             } else if("2".equals(type)) {
-
+                AntExChuModel exChuModel = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)).with(new Sort(Sort.Direction.DESC, "created")), AntExChuModel.class);
+                if(exChuModel != null) {
+                    return DateUtil.getyyyy_MM_dd(exChuModel.getCreated());
+                }
+                AntenatalExaminationModel antenatalExaminationModel = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)).with(new Sort(Sort.Direction.DESC, "created")), AntenatalExaminationModel.class);
+                if(antenatalExaminationModel != null) {
+                    return DateUtil.getyyyy_MM_dd(antenatalExaminationModel.getCreated());
+                }
+            } else if("4".equals(type)) {
+                MaternalDeliverModel md = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)).with(new Sort(Sort.Direction.DESC, "created")), MaternalDeliverModel.class);
+                if(md != null && md.getCreated() != null) {
+                    return DateUtil.getyyyy_MM_dd(md.getCreated());
+                }
+            } else if("5".equals(type)) {
+                DischargeAbstractMotherModel dischargeAbstractMotherModel = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)).with(new Sort(Sort.Direction.DESC, "created")), DischargeAbstractMotherModel.class);
+                if(dischargeAbstractMotherModel != null) {
+                    return DateUtil.getyyyy_MM_dd(dischargeAbstractMotherModel.getCreateDate());
+                }
+            } else if("6".equals(type)) {
+                PostReviewModel p = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)).with(new Sort(Sort.Direction.DESC, "created")), PostReviewModel.class);
+                if(p != null && p.getCreated() != null) {
+                    return DateUtil.getyyyy_MM_dd(p.getCreated());
+                }
+            } else if("7".equals(type)) {
+                BabyModel b = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)).with(new Sort(Sort.Direction.DESC, "created")), BabyModel.class);
+                if(b != null && b.getCreated() != null) {
+                    return DateUtil.getyyyy_MM_dd(b.getCreated());
+                }
+            } else if("8".equals(type)) {
+                BabyCheckModel b = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)).with(new Sort(Sort.Direction.DESC, "created")), BabyCheckModel.class);
+                if(b != null && b.getCreated() != null) {
+                    return DateUtil.getyyyy_MM_dd(b.getCreated());
+                }
             }
         }
 
-- 
1.8.3.1