From cb3672ef38500f3dbbfb98fc920d008d21080ee7 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Thu, 14 Dec 2017 12:31:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=AD=95=E5=A6=87=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=A2=9E=E5=8A=A0=E6=8C=89=E7=85=A7=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/TempFacade.java    | 60 ++++++++++++----------
 1 file changed, 33 insertions(+), 27 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java
index c02447d..4b01eda 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java
@@ -162,7 +162,7 @@ public class TempFacade {
                         data.put("vcCardNo", patients.getVcCardNo());
                         data.put("cardNo", patients.getCardNo());
                         data.put("certeTypeId", patients.getPcerteTypeId());
-                        data.put("status", null==tmp.getNow()?"":getTempStatus(Double.valueOf(tmp.getNow())));
+                        data.put("status", null == tmp.getNow() ? "" : getTempStatus(Double.valueOf(tmp.getNow())));
                         data.put("level", commonService.findRiskLevel(patients.getRiskLevelId()));
                         data.put("rFactor", commonService.resloveFactor(patients.getRiskFactorId()));
                         data.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate()));
@@ -174,18 +174,18 @@ public class TempFacade {
         return new BaseListResponse().setData(dataList).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
     }
 
-    private String getTempStatus(double temp){
-        String str="";
-        if(37.5<=temp&&37.9>=temp){
-            str="低热";
-        }else if(38.0<=temp&&38.9>=temp){
-            str="中等度热";
-        }else if(39.0<=temp&&40.9>=temp){
-            str="高热";
-        }else if(temp>=41){
-            str="超高热";
-        }else if(36<=temp&&37>=temp){
-            str="标准";
+    private String getTempStatus(double temp) {
+        String str = "";
+        if (37.5 <= temp && 37.9 >= temp) {
+            str = "低热";
+        } else if (38.0 <= temp && 38.9 >= temp) {
+            str = "中等度热";
+        } else if (39.0 <= temp && 40.9 >= temp) {
+            str = "高热";
+        } else if (temp >= 41) {
+            str = "超高热";
+        } else if (36 <= temp && 37 >= temp) {
+            str = "标准";
         }
         return str;
     }
@@ -203,12 +203,12 @@ public class TempFacade {
         Assert.notNull(tem, "查看的记录已被删除");
         LinkedHashMap<String, Double> data = tem.getTempList();
         Map map = new HashMap();
-        map.put("errorcode",ErrorCodeConstants.SUCCESS);
+        map.put("errorcode", ErrorCodeConstants.SUCCESS);
         map.put("errormsg", "成功");
         List<String> time = new ArrayList<>();
-        List<String> temp=new ArrayList<>();
-        map.put("time",time);
-        map.put("temp",temp);
+        List<String> temp = new ArrayList<>();
+        map.put("time", time);
+        map.put("temp", temp);
         if (null == data || data.isEmpty()) {
             return map;
         }
@@ -232,7 +232,7 @@ public class TempFacade {
         LinkedHashMap data = temp == null ? new LinkedHashMap<String, Double>() : temp.getTempList();
         data.put(DateUtil.getYyyyMmDd(new Date()), Double.valueOf(tempModel.getNow()));
         tempModel.setTempList(data);
-        if(temp != null) {
+        if (temp != null) {
             temp.setNow(tempModel.getNow());
             temp.setTempList(data);
             temp.setModified(date);
@@ -242,7 +242,7 @@ public class TempFacade {
             tempModel.setCreated(date);
             tempModel.setCreatedTime(DateUtil.getyyyy_MM_dd(date));
             Patients patients = mongoTemplate.findById(tempModel.getParentId(), Patients.class);
-            if(patients != null) {
+            if (patients != null) {
                 tempModel.setPid(patients.getPid());
             }
             tempService.addOneTemp(tempModel);
@@ -252,16 +252,22 @@ public class TempFacade {
 
     public BaseResponse getTemp(String parentId) {
         List<Map<String, Object>> restList = new ArrayList<>();
-        TempModel temp = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(parentId)), TempModel.class);
-        if(temp != null && MapUtils.isNotEmpty(temp.getTempList())) {
-            LinkedHashMap<String, Double> tempList = temp.getTempList();
-            for (Map.Entry<String, Double> entry : tempList.entrySet()) {
-                Map<String, Object> map = new HashMap<>();
-                map.put("date", entry.getKey());
-                map.put("temp", entry.getValue());
-                restList.add(map);
+        List<TempModel> tempList = mongoTemplate.find(Query.query(Criteria.where("pid").is(parentId)), TempModel.class);
+        if (CollectionUtils.isNotEmpty(tempList)) {
+
+            for (TempModel temp : tempList) {
+                if (temp != null && MapUtils.isNotEmpty(temp.getTempList())) {
+                    LinkedHashMap<String, Double> tempList1 = temp.getTempList();
+                    for (Map.Entry<String, Double> entry : tempList1.entrySet()) {
+                        Map<String, Object> map = new HashMap<>();
+                        map.put("date", entry.getKey());
+                        map.put("temp", entry.getValue());
+                        restList.add(map);
+                    }
+                }
             }
         }
+
         com.lyms.platform.operate.web.utils.CollectionUtils.reverseList(restList);
         return RespBuilder.buildSuccess(restList);
     }
-- 
1.8.3.1