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

---
 .../operate/web/service/impl/ReportServiceImpl.java  | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

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 5508a9a..aed1988 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
@@ -596,7 +596,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
                         map.put("hospitalName", couponMapper.findHospitalNameById(patient.getHospitalId()));
                     }
                 }
-                 map.put("checkTime", getCheckTime((String) map.get("type"), (String) map.get("user_id")));
+                 map.put("checkTime", getCheckTime((Integer) map.get("type"), (String) map.get("user_id")));
                 restList.add(map);
             }
             Integer count = couponMapper.findUnUsedInfoCount(CollectionUtils.createMap("userIds", userIds));
@@ -616,14 +616,14 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
      * 7=儿童建档	lyms_baby
      * 8=儿童保健	lyms_babycheck
      */
-    private String getCheckTime(String type, String userId) {
-        if(StringUtils.isNotEmpty(type) && StringUtils.isNotEmpty(userId)) {
-            if("1".equals(type) || "3".equals(type)) {
+    private String getCheckTime(Integer type, String userId) {
+        if(type != null && StringUtils.isNotEmpty(userId)) {
+            if(type == 1 || type == 3) {
                 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)) {
+            } else if(type == 2) {
                 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());
@@ -632,27 +632,27 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
                 if(antenatalExaminationModel != null) {
                     return DateUtil.getyyyy_MM_dd(antenatalExaminationModel.getCreated());
                 }
-            } else if("4".equals(type)) {
+            } else if(type == 4) {
                 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)) {
+            } else if(type == 5) {
                 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)) {
+            } else if(type == 6) {
                 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)) {
+            } else if(type == 7) {
                 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)) {
+            } else if(type == 8) {
                 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