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 f93be0d..9a1461b 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 @@ -14,10 +14,6 @@ public class TemporaryBloodModel extends BaseModel { private String id; - // 孕前体重 - private String beforeWeight; - // 孕前身高 - private String beforeHeight; // 当前体重 private String nowWeight; private Date created; @@ -113,22 +109,6 @@ public class TemporaryBloodModel extends BaseModel { } - public String getBeforeWeight() { - return beforeWeight; - } - - public void setBeforeWeight(String beforeWeight) { - this.beforeWeight = beforeWeight; - } - - public String getBeforeHeight() { - return beforeHeight; - } - - public void setBeforeHeight(String beforeHeight) { - this.beforeHeight = beforeHeight; - } - public String getNowWeight() { return nowWeight; } 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 c8772b2..108f64d 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,7 +22,6 @@ public class TemporaryBloodSugar extends BaseModel { private Date modified; - //高危补充说明 private List otherRisk; //监测状态 1 非药物治疗，监测不足 2 非药物治疗，监测次数达标，血糖控制不理想 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 a8fbd9d..4c637f6 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 @@ -211,9 +211,9 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo temp.put("pulse", bloodPressure.getPulse()); temp.put("status", getPulseStatus(bloodPressure.getSsy(), bloodPressure.getSzy())); temp.put("cardID", temporaryUser.getCardID()); - temp.put("beforWeight", bloodPressure.getBeforeWeight() == null ? "" : bloodPressure.getBeforeWeight()); + temp.put("beforWeight", temporaryUser.getBeforeWeight() == null ? "" : temporaryUser.getBeforeWeight()); temp.put("weight", bloodPressure.getNowWeight() == null ? "" : bloodPressure.getNowWeight()); - temp.put("height", bloodPressure.getBeforeHeight() == null ? "" : bloodPressure.getBeforeHeight()); + temp.put("height", temporaryUser.getBeforeHeight() == null ? "" : temporaryUser.getBeforeHeight()); temp.put("bregmatic", bloodPressure.getBregmatic() == null ? "" : bloodPressure.getBregmatic()); } restList.add(temp); @@ -279,9 +279,9 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo if (temporaryBloo != null) { TemporaryUserModel temporaryUser = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(temporaryBloo.getTemporaryUserId())), TemporaryUserModel.class); //1.1回去bim值 String getBmi(String weight, String height); - String weight = temporaryBloo.getBeforeWeight(); - String height = temporaryBloo.getBeforeHeight(); - String bregmatic = temporaryBloo.getBregmatic(); + String weight = temporaryUser.getBeforeWeight(); + String height = temporaryUser.getBeforeHeight(); + String bregmatic = temporaryUser.getBregmatic(); //2.通过pnationId ID获取到相应的信息例如：末次月经 if (StringUtils.isNotEmpty(weight) && StringUtils.isNotEmpty(height) && StringUtils.isNotEmpty(bregmatic)) { //Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(bloodPressure.getParentId())), Patients.class); @@ -292,8 +292,8 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo paMap.put("phone", temporaryUser.getPhone()); paMap.put("age", DateUtil.getAge(temporaryUser.getBirth())); //paMap.put("dueDate", DateUtil.getyyyy_MM_dd(bloodModel.getDueDate())); - paMap.put("height", temporaryBloo.getBeforeHeight()); - paMap.put("beforWeight", temporaryBloo.getBeforeWeight()); + paMap.put("height", temporaryUser.getBeforeHeight()); + paMap.put("beforWeight", temporaryUser.getBeforeWeight()); paMap.put("weeks", weeks); datas.put("userInfo", paMap); Double bmiD = Double.valueOf(patientWeightService.getBmi(weight, height)).doubleValue(); @@ -334,9 +334,9 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo } } //计算出属于那种类型 偏重 还事负重 还是正常 当前体重-孕前体重 - Double residualWeight = Double.valueOf(temporaryBloo.getNowWeight()).doubleValue() - Double.valueOf(temporaryBloo.getBeforeWeight()).doubleValue(); + Double residualWeight = Double.valueOf(temporaryBloo.getNowWeight()).doubleValue() - Double.valueOf(temporaryUser.getBeforeWeight()).doubleValue(); //把厘米转换成米 - Double heights = (Double.valueOf(temporaryBloo.getBeforeHeight()).doubleValue()) / 100d; + Double heights = (Double.valueOf(temporaryUser.getBeforeHeight()).doubleValue()) / 100d; int cals = this.getRounding((int) this.getCal(bregmatic, residualWeight, low, high, weeks, bmiD, temporaryBloo, heights, temporaryUser)); String calStr = cals + "kcal"; List xyPresentationModels = mongoTemplate.find(Query.query(Criteria.where("originWeek").lte(weeks).and("endWeek").gte(weeks)), XyPresentationModel.class); @@ -438,7 +438,7 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo } public double getCal(String bregmatic, double residualWeight, double low, double high, int weeks, double bmiD, TemporaryBloodModel bloodModel, double heights, TemporaryUserModel temporaryUser) { - Double beforWeight = Double.valueOf(bloodModel.getBeforeWeight()).doubleValue(); + Double beforWeight = Double.valueOf(temporaryUser.getBeforeWeight()).doubleValue(); int age = DateUtil.getAge(temporaryUser.getBirth()); Double number = 354 - 6.91 * age + 1.12 * (9.36 * beforWeight + 726 * heights); //单胎 @@ -528,7 +528,7 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo else if (residualWeight < 0) { //重新计算bmi值 String weight = bloodModel.getNowWeight(); - String height = bloodModel.getBeforeHeight(); + String height = temporaryUser.getBeforeHeight(); Double bmiDs = Double.valueOf(patientWeightService.getBmi(weight, height)).doubleValue(); if (bmiDs < 18.5 && weeks >= 0 && weeks <= 12) { return number + 300; @@ -631,7 +631,7 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo } else if (residualWeight < 0) { //重新计算bmi值 String weight = bloodModel.getNowWeight(); - String height = bloodModel.getBeforeHeight(); + String height = temporaryUser.getBeforeHeight(); Double bmiDs = Double.valueOf(patientWeightService.getBmi(weight, height)).doubleValue(); if (bmiDs <= 24.9 && weeks >= 0 && weeks <= 12) { return number + 300;