From d4e6ffcd39cfc8df396c9dcacbdd828094da2d9c Mon Sep 17 00:00:00 2001 From: wtt <1872109740@qq.com> Date: Mon, 10 Feb 2020 17:07:21 +0800 Subject: [PATCH] update --- .../pojo/VolumeComponentAnalysisModel.java | 10 + .../web/facade/VolumeComponentAnalysisFacade.java | 221 ++++++++++++++++++--- .../platform/operate/web/utils/ReportConfig.java | 15 +- 3 files changed, 206 insertions(+), 40 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/VolumeComponentAnalysisModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/VolumeComponentAnalysisModel.java index 3db4dd9..f6ac16b 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/VolumeComponentAnalysisModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/VolumeComponentAnalysisModel.java @@ -32,6 +32,8 @@ public class VolumeComponentAnalysisModel extends BaseModel { //手机号码 private String phone; private Integer yn; + //前囟 单胎/双胎/多胎 + private String bregmatic; private String parentId; @@ -109,6 +111,14 @@ public class VolumeComponentAnalysisModel extends BaseModel { private String vfiMax; // 5;,    //内脏脂肪指数正常范围的高值 private String vfiMin; // 10;    //内脏脂肪指数正常范围的低值 + public String getBregmatic() { + return bregmatic; + } + + public void setBregmatic(String bregmatic) { + this.bregmatic = bregmatic; + } + public Integer getYn() { return yn; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VolumeComponentAnalysisFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VolumeComponentAnalysisFacade.java index ac6d0ce..34d19e3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VolumeComponentAnalysisFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VolumeComponentAnalysisFacade.java @@ -13,6 +13,7 @@ import com.lyms.platform.common.utils.ReflectionUtils; import com.lyms.platform.operate.web.service.PatientWeightService; import com.lyms.platform.operate.web.service.impl.BaseServiceImpl; import com.lyms.platform.operate.web.service.impl.ComputeKulServiceManager; +import com.lyms.platform.operate.web.utils.ReportConfig; import com.lyms.platform.pojo.BodyMassAnalysisModel; import com.lyms.platform.pojo.Patients; import com.lyms.platform.pojo.TemporaryUserModel; @@ -227,7 +228,7 @@ public class VolumeComponentAnalysisFacade extends BaseServiceImpl { userMap.put("week", DateUtil.getWeekDesc(patients.getLastMenses(), new Date()));//孕周 //获取bmi值 double bmi = Double.valueOf(patientWeightService.getBmi( - volumeComponentAnalysisModel.getWeight(),//当前体重 + volumeComponentAnalysisModel.getBeforeWeight(),//孕前体重 volumeComponentAnalysisModel.getHeight()));//当前身高^ //计算热量值 Map kmap = computeKulServiceManager.getComputeKulByRisk("").getComputeKul( @@ -248,34 +249,46 @@ public class VolumeComponentAnalysisFacade extends BaseServiceImpl { Map componentInfo = new HashMap<>(); // componentInfo.put("water", Double.valueOf(volumeComponentAnalysisModel.getIcw() + Double.valueOf(volumeComponentAnalysisModel.getEcw()))); componentInfo.put("water",volumeComponentAnalysisModel.getWater());//身体总水分 - componentInfo.put("waterMax",volumeComponentAnalysisModel.getWaterMax());//身体总 水分正常范围的高值 - componentInfo.put("waterMin",volumeComponentAnalysisModel.getWaterMax());//身体总 水分正常范围的低值 + Map sfMap = rangeMap(DateUtil.getWeek2(patients.getLastMenses(), new Date()), + Double.valueOf(volumeComponentAnalysisModel.getWeight()), + "sf"); + componentInfo.put("waterMax",sfMap.get("max"));//身体总 水分正常范围的高值 + componentInfo.put("waterMin",sfMap.get("min"));//身体总 水分正常范围的低值 componentInfo.put("icw", volumeComponentAnalysisModel.getIcw());//细胞内液 - Map componentMap = rangeMap(DateUtil.getWeek2(patients.getLastMenses(), new Date()),//孕周 - Double.valueOf(volumeComponentAnalysisModel.getWeight()),//体重 + Map xbnyMap = rangeMap(DateUtil.getWeek2(patients.getLastMenses(), new Date()), + Double.valueOf(volumeComponentAnalysisModel.getWeight()), "xbny"); - componentInfo.put("icwMax", componentMap.get("max"));//细胞内液高值 - componentInfo.put("icwMin", componentMap.get("min"));//细胞内液低值 + componentInfo.put("icwMax", xbnyMap.get("max"));//细胞内液高值 + componentInfo.put("icwMin", xbnyMap.get("min"));//细胞内液低值 componentInfo.put("ecw", volumeComponentAnalysisModel.getEcw());//细胞外液 - Map componentMap1 = rangeMap(DateUtil.getWeek2(patients.getLastMenses(), new Date()),//孕周 - Double.valueOf(volumeComponentAnalysisModel.getWeight()),//体重 + Map xbwyMap = rangeMap(DateUtil.getWeek2(patients.getLastMenses(), new Date()), + Double.valueOf(volumeComponentAnalysisModel.getWeight()), "xbwy"); - componentInfo.put("ecwMax", componentMap1.get("max"));//细胞外液高值 - componentInfo.put("ecwMin", componentMap1.get("min"));//细胞外液低值 + componentInfo.put("ecwMax", xbwyMap.get("max"));//细胞外液高值 + componentInfo.put("ecwMin", xbwyMap.get("min"));//细胞外液低值 componentInfo.put("muscle", volumeComponentAnalysisModel.getMuscle());//肌肉 - componentInfo.put("muscleMax", volumeComponentAnalysisModel.getMuscleMax());//肌肉正常范围的高值 - componentInfo.put("muscleMin", volumeComponentAnalysisModel.getMuscleMin());//肌肉正常范围的低值 + Map jrMap = rangeMap(DateUtil.getWeek2(patients.getLastMenses(), new Date()), + Double.valueOf(volumeComponentAnalysisModel.getWeight()), + "jr"); + componentInfo.put("muscleMax", jrMap.get("max"));//肌肉正常范围的高值 + componentInfo.put("muscleMin", jrMap.get("min"));//肌肉正常范围的低值 componentInfo.put("lbm", volumeComponentAnalysisModel.getLbm());//瘦体重（去脂体重） componentInfo.put("weight", volumeComponentAnalysisModel.getWeight());//体重 componentInfo.put("protein", volumeComponentAnalysisModel.getProtein());//蛋白质 - componentInfo.put("proteinMax", volumeComponentAnalysisModel.getProteinMax());//蛋白质正常范围的高值 - componentInfo.put("proteinMin", volumeComponentAnalysisModel.getProteinMin());//蛋白质正常范围的低值 + Map dbzMap = rangeMap(DateUtil.getWeek2(patients.getLastMenses(), new Date()), + Double.valueOf(volumeComponentAnalysisModel.getWeight()), + "dbz"); + componentInfo.put("proteinMax", dbzMap.get("max"));//蛋白质正常范围的高值 + componentInfo.put("proteinMin", dbzMap.get("min"));//蛋白质正常范围的低值 componentInfo.put("bone", volumeComponentAnalysisModel.getBone());//骨质 - componentInfo.put("boneMax", volumeComponentAnalysisModel.getBoneMax());//骨质正常范围的高值 - componentInfo.put("boneMin", volumeComponentAnalysisModel.getBoneMin());//骨质正常范围的低值 + componentInfo.put("boneMax", "2.5");//骨质正常范围的高值 + componentInfo.put("boneMin", "3.5");//骨质正常范围的低值 componentInfo.put("fat", volumeComponentAnalysisModel.getFat());//脂肪 - componentInfo.put("fatMax", volumeComponentAnalysisModel.getFatMax());//脂肪正常范围的高值 - componentInfo.put("fatMin", volumeComponentAnalysisModel.getFatMin());//脂肪正常范围的低值 + Map zfMap = rangeMap(DateUtil.getWeek2(patients.getLastMenses(), new Date()), + Double.valueOf(volumeComponentAnalysisModel.getWeight()), + "zf"); + componentInfo.put("fatMax", zfMap.get("max"));//脂肪正常范围的高值 + componentInfo.put("fatMin", zfMap.get("min"));//脂肪正常范围的低值 data.add(componentInfo); //体型判定（体型判定2赋值） @@ -284,29 +297,32 @@ public class VolumeComponentAnalysisFacade extends BaseServiceImpl { //基本评估 Map basicInfo = new HashMap<>(); basicInfo.put("basicWeight", volumeComponentAnalysisModel.getWeight());//体重 - basicInfo.put("basicWeightMax", volumeComponentAnalysisModel.getWeightMax());//体重正常范围的高值 - basicInfo.put("basicWeightMin", volumeComponentAnalysisModel.getWeightMin());//体重正常范围的低值 + Map tzMap = rangeMaptz( DateUtil.getWeek2(patients.getLastMenses(), new Date()), + Double.valueOf(volumeComponentAnalysisModel.getBeforeWeight()), bmi, volumeComponentAnalysisModel.getBregmatic()); + basicInfo.put("basicWeightMax", tzMap.get("max"));//体重正常范围的高值 + basicInfo.put("basicWeightMin", tzMap.get("min"));//体重正常范围的低值 basicInfo.put("basicMuscle", volumeComponentAnalysisModel.getMuscle());//肌肉 - basicInfo.put("basicMuscleMax", volumeComponentAnalysisModel.getMuscleMax());//肌肉正常范围的高值 - basicInfo.put("basicMuscleMin", volumeComponentAnalysisModel.getMuscleMin());//肌肉正常范围的低值 + basicInfo.put("basicMuscleMax", jrMap.get("max"));//肌肉正常范围的高值 + basicInfo.put("basicMuscleMin", jrMap.get("min"));//肌肉正常范围的低值 basicInfo.put("basicPbf", volumeComponentAnalysisModel.getPbf());//体脂百分比 - basicInfo.put("basicPbfMax", volumeComponentAnalysisModel.getPbfMax());//体脂率正常范围的高值 - basicInfo.put("basicPbfMin", volumeComponentAnalysisModel.getPbfMin());//体脂率正常范围的低值 + basicInfo.put("basicPbfMax", zfMap.get("max"));//体脂率正常范围的高值 + basicInfo.put("basicPbfMin", zfMap.get("min"));//体脂率正常范围的低值 basicInfo.put("basicBone", volumeComponentAnalysisModel.getBone());//骨质 - basicInfo.put("basicBoneMax", volumeComponentAnalysisModel.getBoneMax());//骨质正常范围的高值 - basicInfo.put("basicBoneMin", volumeComponentAnalysisModel.getBoneMin());//骨质正常范围的低值 + basicInfo.put("basicBoneMax", "3.5");//骨质正常范围的高值 + basicInfo.put("basicBoneMin", "2.5");//骨质正常范围的低值 basicInfo.put("basicWater",volumeComponentAnalysisModel.getWater());//身体总水分 - basicInfo.put("basicWaterMax",volumeComponentAnalysisModel.getWaterMax());//身体总 水分正常范围的高值 - basicInfo.put("basicWaterMin",volumeComponentAnalysisModel.getWaterMin());//身体总 水分正常范围的低值 + + basicInfo.put("basicWaterMax",sfMap.get("max"));//身体总 水分正常范围的高值 + basicInfo.put("basicWaterMin",sfMap.get("min"));//身体总 水分正常范围的低值 basicInfo.put("basicSmm", volumeComponentAnalysisModel.getSmm());//骨骼肌 basicInfo.put("basicSmmMax", volumeComponentAnalysisModel.getSmmMax());//骨骼肌正常范围的高值 basicInfo.put("basicSmmMin", volumeComponentAnalysisModel.getSmmMin());//骨骼肌正常范围的低值 basicInfo.put("basicBmi", volumeComponentAnalysisModel.getBmi());//体质指数 basicInfo.put("basicBmiMax", volumeComponentAnalysisModel.getBmiMax());//体质指数正常范围的高值 basicInfo.put("basicBmiMin", volumeComponentAnalysisModel.getBmiMin());//体质指数正常范围的低值 - basicInfo.put("basicWhr", volumeComponentAnalysisModel.getWhr());//腰臀比（2位小数） - basicInfo.put("basicWhrMax", volumeComponentAnalysisModel.getWhrMax());//腰臀比正常范围的高值 - basicInfo.put("basicWhrMin", volumeComponentAnalysisModel.getWhrMin());//腰臀比正常范围的低值 +// basicInfo.put("basicWhr", volumeComponentAnalysisModel.getWhr());//腰臀比（2位小数） 泉渝说郝总说不用做 +// basicInfo.put("basicWhrMax", volumeComponentAnalysisModel.getWhrMax());//腰臀比正常范围的高值 +// basicInfo.put("basicWhrMin", volumeComponentAnalysisModel.getWhrMin());//腰臀比正常范围的低值 data.add(basicInfo); //体重管理 @@ -715,42 +731,183 @@ public class VolumeComponentAnalysisFacade extends BaseServiceImpl { if ("xbny".equals(type)) {//细胞内液含量正常范围 double min = weight * 0.175; double max = weight * 0.188; + max= new BigDecimal(max).setScale(2, RoundingMode.DOWN).doubleValue(); + min= new BigDecimal(min).setScale(2, RoundingMode.DOWN).doubleValue(); map.put("min", Double.toString(min)); map.put("max", Double.toString(max)); }else if ("xbwy".equals(type)) {//细胞外液体含量正常范围 double min = weight * 0.12; double max = weight * 0.16; + max= new BigDecimal(max).setScale(2, RoundingMode.DOWN).doubleValue(); + min= new BigDecimal(min).setScale(2, RoundingMode.DOWN).doubleValue(); + map.put("min", Double.toString(min)); + map.put("max", Double.toString(max)); + }else if ("jr".equals(type)) {//肌肉正常范围 + double min = weight * 0.65; + double max = weight * 0.80; + max= new BigDecimal(max).setScale(2, RoundingMode.DOWN).doubleValue(); + min= new BigDecimal(min).setScale(2, RoundingMode.DOWN).doubleValue(); + map.put("min", Double.toString(min)); + map.put("max", Double.toString(max)); + }else if ("dbz".equals(type)) {//蛋白质 + double min = weight * 0.13; + double max = weight * 0.17; + max= new BigDecimal(max).setScale(2, RoundingMode.DOWN).doubleValue(); + min= new BigDecimal(min).setScale(2, RoundingMode.DOWN).doubleValue(); + map.put("min", Double.toString(min)); + map.put("max", Double.toString(max)); + }else if ("zf".equals(type)) {//体脂百分比正常范围 + double min = weight * 0.214; + double max = weight * 0.35; + max= new BigDecimal(max).setScale(2, RoundingMode.DOWN).doubleValue(); + min= new BigDecimal(min).setScale(2, RoundingMode.DOWN).doubleValue(); + map.put("min", Double.toString(min)); + map.put("max", Double.toString(max)); + /*体脂百分比正常范围 体重×21.4-35% 体重×21.4-35% 体重×25-35%*/ + }else if ("sf".equals(type)) {//人体总水分含量正常范围 + double min = weight * 0.375; + double max = weight * 0.48; + max= new BigDecimal(max).setScale(2, RoundingMode.DOWN).doubleValue(); + min= new BigDecimal(min).setScale(2, RoundingMode.DOWN).doubleValue(); map.put("min", Double.toString(min)); map.put("max", Double.toString(max)); + /*人体总水分含量正常范围 体重×37.5-48% 体重×40.57-50.1% 体重×42.7-52.74%*/ } //孕中期 } else if (week >= 13 && week <= 28) {//蛋白质 if ("xbny".equals(type)) { double min = weight * 0.175; double max = weight * 0.188; + max= new BigDecimal(max).setScale(2, RoundingMode.DOWN).doubleValue(); + min= new BigDecimal(min).setScale(2, RoundingMode.DOWN).doubleValue(); map.put("min", Double.toString(min)); map.put("max", Double.toString(max)); }else if ("xbwy".equals(type)) { double min = weight * 0.13; double max = weight * 0.17; + max= new BigDecimal(max).setScale(2, RoundingMode.DOWN).doubleValue(); + min= new BigDecimal(min).setScale(2, RoundingMode.DOWN).doubleValue(); map.put("min", Double.toString(min)); map.put("max", Double.toString(max)); + }else if ("jr".equals(type)) {//肌肉正常范围 + double min = weight * 0.67; + double max = weight * 0.80; + max= new BigDecimal(max).setScale(2, RoundingMode.DOWN).doubleValue(); + min= new BigDecimal(min).setScale(2, RoundingMode.DOWN).doubleValue(); + map.put("min", Double.toString(min)); + map.put("max", Double.toString(max)); + }else if ("dbz".equals(type)) {//蛋白质 + double min = weight * 0.15; + double max = weight * 0.18; + max= new BigDecimal(max).setScale(2, RoundingMode.DOWN).doubleValue(); + min= new BigDecimal(min).setScale(2, RoundingMode.DOWN).doubleValue(); + map.put("min", Double.toString(min)); + map.put("max", Double.toString(max)); + }else if ("zf".equals(type)) {//体脂百分比正常范围 + double min = weight * 0.214; + double max = weight * 0.35; + max= new BigDecimal(max).setScale(2, RoundingMode.DOWN).doubleValue(); + min= new BigDecimal(min).setScale(2, RoundingMode.DOWN).doubleValue(); + map.put("min", Double.toString(min)); + map.put("max", Double.toString(max)); + /*体脂百分比正常范围 体重×21.4-35% 体重×21.4-35% 体重×25-35%*/ + }else if ("sf".equals(type)) {//人体总水分含量正常范围 + double min = weight * 0.4057; + double max = weight * 0.501; + max= new BigDecimal(max).setScale(2, RoundingMode.DOWN).doubleValue(); + min= new BigDecimal(min).setScale(2, RoundingMode.DOWN).doubleValue(); + map.put("min", Double.toString(min)); + map.put("max", Double.toString(max)); + /*人体总水分含量正常范围 体重×37.5-48% 体重×40.57-50.1% 体重×42.7-52.74%*/ } //孕晚期 } else if (week >= 29 && week <= 40) {//蛋白质 if ("xbny".equals(type)) { double min = weight * 0.175; double max = weight * 0.188; + max= new BigDecimal(max).setScale(2, RoundingMode.DOWN).doubleValue(); + min= new BigDecimal(min).setScale(2, RoundingMode.DOWN).doubleValue(); map.put("min", Double.toString(min)); map.put("max", Double.toString(max)); }else if ("xbwy".equals(type)) { double min = weight * 0.15; double max = weight * 0.18; + max= new BigDecimal(max).setScale(2, RoundingMode.DOWN).doubleValue(); + min= new BigDecimal(min).setScale(2, RoundingMode.DOWN).doubleValue(); + map.put("min", Double.toString(min)); + map.put("max", Double.toString(max)); + }else if ("jr".equals(type)) {//肌肉正常范围 + double min = weight * 0.70; + double max = weight * 0.85; + max= new BigDecimal(max).setScale(2, RoundingMode.DOWN).doubleValue(); + min= new BigDecimal(min).setScale(2, RoundingMode.DOWN).doubleValue(); map.put("min", Double.toString(min)); map.put("max", Double.toString(max)); + }else if ("dbz".equals(type)) {//蛋白质 + double min = weight * 0.1578; + double max = weight * 0.192; + max= new BigDecimal(max).setScale(2, RoundingMode.DOWN).doubleValue(); + min= new BigDecimal(min).setScale(2, RoundingMode.DOWN).doubleValue(); + map.put("min", Double.toString(min)); + map.put("max", Double.toString(max)); + }else if ("zf".equals(type)) {//体脂百分比正常范围 + double min = weight * 0.25; + double max = weight * 0.35; + max= new BigDecimal(max).setScale(2, RoundingMode.DOWN).doubleValue(); + min= new BigDecimal(min).setScale(2, RoundingMode.DOWN).doubleValue(); + map.put("min", Double.toString(min)); + map.put("max", Double.toString(max)); + /*体脂百分比正常范围 体重×21.4-35% 体重×21.4-35% 体重×25-35%*/ + }else if ("sf".equals(type)) {//人体总水分含量正常范围 + double min = weight * 0.427; + double max = weight * 0.5274; + max= new BigDecimal(max).setScale(2, RoundingMode.DOWN).doubleValue(); + min= new BigDecimal(min).setScale(2, RoundingMode.DOWN).doubleValue(); + map.put("min", Double.toString(min)); + map.put("max", Double.toString(max)); + /*人体总水分含量正常范围 体重×37.5-48% 体重×40.57-50.1% 体重×42.7-52.74%*/ } } return map; } + + private Map rangeMaptz(Integer week, double weight,double bmi,String bregmatic){ + Map map = new HashMap<>(); + // 前囟 单胎/双胎/多胎 + //private String bregmatic; lyms_patient_weight + String bmiStr = ""; + if (StringUtils.isEmpty(bregmatic) || "1".equals(bregmatic)) { + if (bmi < 18.5) { + bmiStr = "BMI<18.5孕" + week + "周"; + } else if (bmi <= 24.9 && bmi >= 18.5) { + bmiStr = "BMI=18.5-24.9孕" + week + "周"; + } else if (bmi <= 29.9 && bmi >= 25) { + bmiStr = "BMI=25-29.9孕" + week + "周"; + } else if (bmi >= 30) { + bmiStr = "BMI≥30孕" + week + "周"; + } + } else { + if (bmi <= 24.9) { + bmiStr = "BMI≤24.9孕" + week + "周"; + } else if (bmi <= 29.9 && bmi >= 25) { + bmiStr = "BMI=25-29.9孕" + week + "周"; + } else if (bmi >= 30) { + bmiStr = "BMI≥30孕" + week + "周"; + } + } + String[] rangeWeight = null; + if (StringUtils.isEmpty(bregmatic) || "1".equals(bregmatic)) { + rangeWeight = ReportConfig.getWeightRange(bmiStr).split("-"); + } else { + rangeWeight = ReportConfig.getDWeightRange(bmiStr).split("-"); + } + double addWeightStart = Double.parseDouble(rangeWeight[0]); + double addWeightEnd = Double.parseDouble(rangeWeight[1]); + double max= new BigDecimal(addWeightStart+weight).setScale(2, RoundingMode.DOWN).doubleValue(); + double min= new BigDecimal(addWeightEnd+weight).setScale(2, RoundingMode.DOWN).doubleValue(); + map.put("min", Double.toString(min)); + map.put("max", Double.toString(max)); + return map; + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ReportConfig.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ReportConfig.java index 0fd0279..2cc65cf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ReportConfig.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ReportConfig.java @@ -52,8 +52,7 @@ public class ReportConfig { N_S_AREA.put("宁夏回族自治区","北方"); - - //WEIGHT_RANGE.put("BMI<18.5孕0-12周","1.00-1.50"); + WEIGHT_RANGE.put("BMI<18.5孕12周","1.00-1.50"); WEIGHT_RANGE.put("BMI<18.5孕13周","1.41-2.09"); WEIGHT_RANGE.put("BMI<18.5孕14周","1.82-2.68"); WEIGHT_RANGE.put("BMI<18.5孕15周","2.23-3.27"); @@ -84,7 +83,7 @@ public class ReportConfig { WEIGHT_RANGE.put("BMI<18.5孕40周","12.50-18.00"); - // WEIGHT_RANGE.put("BMI=18.5-24.9孕0-12周","1.00-1.50"); + WEIGHT_RANGE.put("BMI=18.5-24.9孕12周","1.00-1.50"); WEIGHT_RANGE.put("BMI=18.5-24.9孕13周","1.37-2.02"); WEIGHT_RANGE.put("BMI=18.5-24.9孕14周","1.75-2.54"); WEIGHT_RANGE.put("BMI=18.5-24.9孕15周","2.12-3.06"); @@ -115,7 +114,7 @@ public class ReportConfig { WEIGHT_RANGE.put("BMI=18.5-24.9孕40周","11.50-16.00"); - //WEIGHT_RANGE.put("BMI=25-29.9孕0-12周","1.00-1.50"); + WEIGHT_RANGE.put("BMI=25-29.9孕12周","1.00-1.50"); WEIGHT_RANGE.put("BMI=25-29.9孕13周","1.21-1.86"); WEIGHT_RANGE.put("BMI=25-29.9孕14周","1.42-2.22"); WEIGHT_RANGE.put("BMI=25-29.9孕15周","1.64-2.58"); @@ -146,7 +145,7 @@ public class ReportConfig { WEIGHT_RANGE.put("BMI=25-29.9孕40周","7.00-11.50"); - //WEIGHT_RANGE.put("BMI≥30孕0-12周","1.00-1.50"); + WEIGHT_RANGE.put("BMI≥30孕12周","1.00-1.50"); WEIGHT_RANGE.put("BMI≥30孕13周","1.14-1.77"); WEIGHT_RANGE.put("BMI≥30孕14周","1.28-2.04"); WEIGHT_RANGE.put("BMI≥30孕15周","1.42-2.31"); @@ -177,7 +176,7 @@ public class ReportConfig { WEIGHT_RANGE.put("BMI≥30孕40周","5.00-9.00"); - //DWEIGHT_RANGE.put("BMI≤24.9孕0-12周","1.00-1.50kg"); + DWEIGHT_RANGE.put("BMI≤24.9孕12周","1.00-1.50kg"); DWEIGHT_RANGE.put("BMI≤24.9孕13周","1.57-2.34"); DWEIGHT_RANGE.put("BMI≤24.9孕14周","2.14-3.18"); DWEIGHT_RANGE.put("BMI≤24.9孕15周","2.71-4.02"); @@ -208,7 +207,7 @@ public class ReportConfig { DWEIGHT_RANGE.put("BMI≤24.9孕40周","17.00-25.00"); - //DWEIGHT_RANGE.put("BMI=25-29.9孕0-12周","1.00-1.50"); + DWEIGHT_RANGE.put("BMI=25-29.9孕12周","1.00-1.50"); DWEIGHT_RANGE.put("BMI=25-29.9孕13周","1.46-2.27"); DWEIGHT_RANGE.put("BMI=25-29.9孕14周","1.93-3.04"); DWEIGHT_RANGE.put("BMI=25-29.9孕15周","2.39-3.81"); @@ -238,7 +237,7 @@ public class ReportConfig { DWEIGHT_RANGE.put("BMI=25-29.9孕39周","13.55-22.29"); DWEIGHT_RANGE.put("BMI=25-29.9孕40周","14.00-23.00"); - //DWEIGHT_RANGE.put("BMI≥30孕0-12周","1.00-1.50"); + DWEIGHT_RANGE.put("BMI≥30孕12周","1.00-1.50"); DWEIGHT_RANGE.put("BMI≥30孕13周","1.36-2.12"); DWEIGHT_RANGE.put("BMI≥30孕14周","1.72-2.75"); DWEIGHT_RANGE.put("BMI≥30孕15周","2.08-3.37"); -- 1.8.3.1