From ad7ae004d97df69d7380d8594b3cd7b66d9fa381 Mon Sep 17 00:00:00 2001 From: wangbo <184677810@qq.com> Date: Sun, 5 May 2019 15:30:11 +0800 Subject: [PATCH] update --- .../java/com/lyms/platform/pojo/TemporaryBloodModel.java | 11 ----------- .../java/com/lyms/platform/pojo/TemporaryBloodSugar.java | 12 ------------ .../operate/web/controller/TemporaryUserController.java | 3 +-- .../operate/web/service/impl/TemporaryBloodServiceImpl.java | 2 +- .../web/service/impl/TemporaryBloodSugarServiceImpl.java | 4 ++-- 5 files changed, 4 insertions(+), 28 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodModel.java index 9a1461b..3ba7a30 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodModel.java @@ -24,10 +24,6 @@ public class TemporaryBloodModel extends BaseModel { private String ssy; // 脉搏 private Integer pulse; - - // 前囟 单胎/双胎/多胎 - private String bregmatic; - private String hospitalId; private Integer yn; @@ -92,13 +88,6 @@ public class TemporaryBloodModel extends BaseModel { this.pulse = pulse; } - public String getBregmatic() { - return bregmatic; - } - - public void setBregmatic(String bregmatic) { - this.bregmatic = bregmatic; - } public String getId() { return id; 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 86bfeed..e0ff1b9 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 @@ -42,10 +42,6 @@ public class TemporaryBloodSugar extends BaseModel { private Map dayWeights; - - // 前囟 单胎/双胎/多胎 - private String bregmatic; - private String hospitalId; //报告状态 1未查看 2查看 private Integer status; @@ -70,14 +66,6 @@ public class TemporaryBloodSugar extends BaseModel { } - public String getBregmatic() { - return bregmatic; - } - - public void setBregmatic(String bregmatic) { - this.bregmatic = bregmatic; - } - public Map getDayWeights() { return dayWeights; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryUserController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryUserController.java index 0150e1c..3222f1d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryUserController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryUserController.java @@ -24,8 +24,7 @@ public class TemporaryUserController extends BaseController { @ResponseBody @RequestMapping(value = "/addAndUpdate", method = RequestMethod.POST) @TokenRequired - //@Valid @RequestBody - public BaseResponse addAndUpdate( TemporaryUserModel temporaryUser, HttpServletRequest request) { + public BaseResponse addAndUpdate(@Valid @RequestBody TemporaryUserModel temporaryUser, HttpServletRequest request) { return temporaryUserService.addAndUpdate(temporaryUser, getUserId(request)); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java index 1a004e1..65bdbe4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java @@ -214,7 +214,7 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo temp.put("beforWeight", temporaryUser.getBeforeWeight() == null ? "" : temporaryUser.getBeforeWeight()); temp.put("weight", bloodPressure.getNowWeight() == null ? "" : bloodPressure.getNowWeight()); temp.put("height", temporaryUser.getBeforeHeight() == null ? "" : temporaryUser.getBeforeHeight()); - temp.put("bregmatic", bloodPressure.getBregmatic() == null ? "" : bloodPressure.getBregmatic()); + temp.put("bregmatic", temporaryUser.getBregmatic() == null ? "" : temporaryUser.getBregmatic()); } restList.add(temp); } 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 23ec0c7..112ac69 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 @@ -210,7 +210,7 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I temp.put("bloodSugarType", BloodSugarEnums.getName(bloodSugar.getBloodSugarType())); temp.put("bloodSugarId", bloodSugar.getBloodSugarType()); temp.put("status", getBloodSugarStatus(bloodSugar.getBloodSugarType(), bloodSugar.getBloodSugar())); - temp.put("bregmatic", bloodSugar.getBregmatic()); + temp.put("bregmatic", temporaryUser.getBregmatic()); temp.put("cardNo", temporaryUser.getCardID()); } restList.add(temp); @@ -357,7 +357,7 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I double bmi = Double.parseDouble(bmiStr); //根据高危获取不同的卡路里计算公式 Map kmap = computeKulServiceManager.getComputeKulByRisk(rid).getComputeKul(Double.parseDouble(temporaryUser.getBeforeWeight()), - Double.parseDouble(bloodSugar.getNowWeight()), week, bmi, bloodSugar.getBregmatic(), temporaryUser.getBeforeHeight()); + Double.parseDouble(bloodSugar.getNowWeight()), week, bmi, temporaryUser.getBregmatic(), temporaryUser.getBeforeHeight()); String weekYyzl = ""; -- 1.8.3.1