From 605e92a9e2f68b1210d07bce591fe94df87fa4ed Mon Sep 17 00:00:00 2001
From: wangbo <184677810@qq.com>
Date: Tue, 30 Apr 2019 10:24:38 +0800
Subject: [PATCH] update

---
 .../com/lyms/platform/pojo/TemporaryBloodSugar.java   | 19 -------------------
 .../service/impl/TemporaryBloodSugarServiceImpl.java  |  4 ++--
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodSugar.java b/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodSugar.java
index 108f64d..86bfeed 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodSugar.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodSugar.java
@@ -22,8 +22,6 @@ public class TemporaryBloodSugar extends BaseModel {
 
     private Date modified;
 
-    //高危补充说明
-    private List otherRisk;
     //监测状态  1 非药物治疗，监测不足 2 非药物治疗，监测次数达标，血糖控制不理想
     //3 非药物治疗，监测次数达标，血糖控制良好 4 药物治疗，监测不足s
     //5 药物治疗，监测次数达标，血糖波动较大 6 药物治疗，监测次数达标，血糖控制良好
@@ -48,8 +46,6 @@ public class TemporaryBloodSugar extends BaseModel {
     // 前囟 单胎/双胎/多胎
     private String bregmatic;
 
-    private String riskLevelId;
-
     private String hospitalId;
     //报告状态 1未查看 2查看
     private Integer status;
@@ -73,13 +69,6 @@ public class TemporaryBloodSugar extends BaseModel {
         this.hospitalId = hospitalId;
     }
 
-    public String getRiskLevelId() {
-        return riskLevelId;
-    }
-
-    public void setRiskLevelId(String riskLevelId) {
-        this.riskLevelId = riskLevelId;
-    }
 
     public String getBregmatic() {
         return bregmatic;
@@ -164,14 +153,6 @@ public class TemporaryBloodSugar extends BaseModel {
     }
 
 
-    public List getOtherRisk() {
-        return otherRisk;
-    }
-
-    public void setOtherRisk(List otherRisk) {
-        this.otherRisk = otherRisk;
-    }
-
     public Integer getMonitorStatus() {
         return monitorStatus;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java
index 6940b85..23ec0c7 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java
@@ -190,9 +190,9 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I
             if (bloodSugars != null) {
                 temp.put("username", temporaryUser.getUserName());
                 temp.put("time", DateUtil.getyyyy_MM_dd(bloodSugar.getModified()));
-                temp.put("age", DateUtil.getAge(temporaryUser.getBirth()));
+                temp.put("age", DateUtil.getAge(temporaryUser.getBirth(), new Date()));
                 temp.put("week", DateUtil.getWeekDesc(temporaryUser.getLastMenses(), new Date()));
-                temp.put("riskLevel", commonService.findRiskLevel(bloodSugar.getRiskLevelId())); //高危等级（颜色）
+                temp.put("riskLevel", commonService.findRiskLevel(temporaryUser.getRiskLevelId())); //高危等级（颜色）
                 String rFactor = commonService.resloveFactor(temporaryUser.getRiskFactorId());
                 if (temporaryUser.getHighriskDesc() != null && !"null".equals(temporaryUser.getHighriskDesc())) {
                     if (StringUtils.isNotEmpty(rFactor)) {
-- 
1.8.3.1