From 57c1b237c6c37c176a8820295e8c302ef84326b7 Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Thu, 30 Nov 2017 17:25:51 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=97=E5=8F=B7=E6=94=B9=E6=8B=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/common/utils/DateUtil.java   | 32 ++++++++++++++--------
 .../operate/web/controller/ReportController.java   |  2 +-
 .../web/service/impl/BloodPressureServiceImpl.java |  5 ++--
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
index 45c261f..90bc9c6 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
@@ -1330,20 +1330,28 @@ public class DateUtil {
         List<Map<String, Date>> restList = new ArrayList<>();
         if(start != null && end != null) {
             List<Date> dates = getMonthBetween(start, end);
-            for (int i = 0; i < dates.size(); i++) {
+            if(dates.size() == 1) {
                 Map<String, Date> temp = new HashMap<>();
-                temp.put("cname", dates.get(i));
-                if(i == 0) {
-                    temp.put("start", start);
-                    temp.put("end", dates.size() > 1 ? dates.get(i + 1) : dates.get(i + 0));
-                } else if(i == dates.size() - 1) {
-                    temp.put("start", dates.get(dates.size() - 1));
-                    temp.put("end", end);
-                } else {
-                    temp.put("start", dates.get(i));
-                    temp.put("end", dates.get(i + 1));
-                }
+                temp.put("cname", dates.get(0));
+                temp.put("start", start);
+                temp.put("end", end);
                 restList.add(temp);
+            } else {
+                for (int i = 0; i < dates.size(); i++) {
+                    Map<String, Date> temp = new HashMap<>();
+                    temp.put("cname", dates.get(i));
+                    if(i == 0) {
+                        temp.put("start", start);
+                        temp.put("end", dates.get(i + 1));
+                    } else if(i == dates.size() - 1) {
+                        temp.put("start", dates.get(dates.size() - 1));
+                        temp.put("end", end);
+                    } else {
+                        temp.put("start", dates.get(i));
+                        temp.put("end", dates.get(i + 1));
+                    }
+                    restList.add(temp);
+                }
             }
         }
         return restList;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java
index e222484..dd99a76 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java
@@ -59,7 +59,7 @@ public class ReportController extends BaseController {
     @RequestMapping(value = "/patients/export", method = RequestMethod.GET)
     public void patientsExport(String provinceId, String cityId, String areaId, String streetId, Integer statistType,
                                Integer ageType, Integer patientType, Date startDate, Date endDate, HttpServletRequest request, HttpServletResponse response) {
-        reportService.patientsExport(provinceId, cityId, areaId, streetId, statistType, ageType, patientType, startDate, endDate, getUserId(request), response);
+        reportService.patientsExport(provinceId, cityId, areaId, streetId, statistType, ageType == null ? ageType : ageType + 1, patientType, startDate, endDate, getUserId(request), response);
 //        reportService.patientsExport(provinceId, cityId, aredId, streetId, statistType, ageType, patientType, startDate, endDate, 1000000185, response);
     }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java
index ec664ee..7735da8 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java
@@ -53,7 +53,8 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP
         temp.put("ssy", bloodPressure.getSsy());
         temp.put("pulse", bloodPressure.getPulse());
         temp.put("hospitalId", hospitalId);
-        if(StringUtils.isEmpty(bloodPressure.getId())) {
+        BloodPressure bp = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(bloodPressure.getParentId()).and("yn").ne(0)), BloodPressure.class);
+        if(bp == null) {
             String parentId = mongoUtil.doHidePatient(bloodPressure.getParentId(), hospitalId);
             bloodPressure.setParentId(parentId);
             bloodPressure.setYn(YnEnums.YES.getId());
@@ -65,7 +66,7 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP
             bloodPressure.setInfos(infos);
             bloodPressureService.add(bloodPressure);
         } else {
-            Map<String, Map<String, Object>> infos = mongoTemplate.findById(bloodPressure.getId(), BloodPressure.class).getInfos();
+            Map<String, Map<String, Object>> infos = bp.getInfos();
             infos.put(DateUtil.getyyyy_MM_dd(new Date()), temp);
             bloodPressureService.update(bloodPressure);
         }
-- 
1.8.3.1