Commit 605e92a9e2f68b1210d07bce591fe94df87fa4ed
1 parent
3ba743b7e6
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 2 additions and 21 deletions
platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodSugar.java
View file @
605e92a
| ... | ... | @@ -22,8 +22,6 @@ |
| 22 | 22 | |
| 23 | 23 | private Date modified; |
| 24 | 24 | |
| 25 | - //高危补充说明 | |
| 26 | - private List otherRisk; | |
| 27 | 25 | //监测状态 1 非药物治疗，监测不足 2 非药物治疗，监测次数达标，血糖控制不理想 |
| 28 | 26 | //3 非药物治疗，监测次数达标，血糖控制良好 4 药物治疗，监测不足s |
| 29 | 27 | //5 药物治疗，监测次数达标，血糖波动较大 6 药物治疗，监测次数达标，血糖控制良好 |
| ... | ... | @@ -48,8 +46,6 @@ |
| 48 | 46 | // 前囟 单胎/双胎/多胎 |
| 49 | 47 | private String bregmatic; |
| 50 | 48 | |
| 51 | - private String riskLevelId; | |
| 52 | - | |
| 53 | 49 | private String hospitalId; |
| 54 | 50 | //报告状态 1未查看 2查看 |
| 55 | 51 | private Integer status; |
| 56 | 52 | |
| ... | ... | @@ -73,14 +69,7 @@ |
| 73 | 69 | this.hospitalId = hospitalId; |
| 74 | 70 | } |
| 75 | 71 | |
| 76 | - public String getRiskLevelId() { | |
| 77 | - return riskLevelId; | |
| 78 | - } | |
| 79 | 72 | |
| 80 | - public void setRiskLevelId(String riskLevelId) { | |
| 81 | - this.riskLevelId = riskLevelId; | |
| 82 | - } | |
| 83 | - | |
| 84 | 73 | public String getBregmatic() { |
| 85 | 74 | return bregmatic; |
| 86 | 75 | } |
| ... | ... | @@ -163,14 +152,6 @@ |
| 163 | 152 | this.modified = modified; |
| 164 | 153 | } |
| 165 | 154 | |
| 166 | - | |
| 167 | - public List getOtherRisk() { | |
| 168 | - return otherRisk; | |
| 169 | - } | |
| 170 | - | |
| 171 | - public void setOtherRisk(List otherRisk) { | |
| 172 | - this.otherRisk = otherRisk; | |
| 173 | - } | |
| 174 | 155 | |
| 175 | 156 | public Integer getMonitorStatus() { |
| 176 | 157 | return monitorStatus; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java
View file @
605e92a
| ... | ... | @@ -190,9 +190,9 @@ |
| 190 | 190 | if (bloodSugars != null) { |
| 191 | 191 | temp.put("username", temporaryUser.getUserName()); |
| 192 | 192 | temp.put("time", DateUtil.getyyyy_MM_dd(bloodSugar.getModified())); |
| 193 | - temp.put("age", DateUtil.getAge(temporaryUser.getBirth())); | |
| 193 | + temp.put("age", DateUtil.getAge(temporaryUser.getBirth(), new Date())); | |
| 194 | 194 | temp.put("week", DateUtil.getWeekDesc(temporaryUser.getLastMenses(), new Date())); |
| 195 | - temp.put("riskLevel", commonService.findRiskLevel(bloodSugar.getRiskLevelId())); //高危等级（颜色） | |
| 195 | + temp.put("riskLevel", commonService.findRiskLevel(temporaryUser.getRiskLevelId())); //高危等级（颜色） | |
| 196 | 196 | String rFactor = commonService.resloveFactor(temporaryUser.getRiskFactorId()); |
| 197 | 197 | if (temporaryUser.getHighriskDesc() != null && !"null".equals(temporaryUser.getHighriskDesc())) { |
| 198 | 198 | if (StringUtils.isNotEmpty(rFactor)) { |