Commit 35d2649f1ee1eba14a81a09c3768f015a9d40a3c
1 parent
f9fb6d8e69
Exists in
master
and in
6 other branches
体重修改
Showing 1 changed file with 2 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java
View file @
35d2649
| ... | ... | @@ -251,7 +251,7 @@ |
| 251 | 251 | boolean flag = false; |
| 252 | 252 | List<String> hospital = groupsFacade.findGroupHospital(userId, false); |
| 253 | 253 | Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); |
| 254 | - Criteria pCriteria = Criteria.where("yn").is(1).and("hospitalId").in(hospital).and("type").is(1); | |
| 254 | + Criteria pCriteria = Criteria.where("yn").is(1).and("hospitalId").in(hospital); | |
| 255 | 255 | if (StringUtils.isNotBlank(key)) { |
| 256 | 256 | pCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("username").regex(key), Criteria.where("cardNo").is(key)); |
| 257 | 257 | flag = true; |
| ... | ... | @@ -309,7 +309,7 @@ |
| 309 | 309 | temp.put("id", patientWeight.getId()); |
| 310 | 310 | temp.put("username", p.getUsername()); |
| 311 | 311 | temp.put("age", DateUtil.getAge(p.getBirth())); |
| 312 | - temp.put("week", DateUtil.getWeekDesc(p.getLastMenses(), new Date())); | |
| 312 | + temp.put("week", p.getType() == 3 ? "已分娩" : DateUtil.getWeekDesc(p.getLastMenses(), new Date())); | |
| 313 | 313 | temp.put("beforeWeight", patientWeight.getBeforeWeight()); |
| 314 | 314 | temp.put("beforeHeight", patientWeight.getBeforeHeight()); |
| 315 | 315 | temp.put("bim", patientWeight.getBmi()); // 体质指数（BMI）=体重（kg）÷身高^2（m） |