From 368324b921acc654a0f03745dc2d717f50b3a1fc Mon Sep 17 00:00:00 2001 From: wangbo <184677810@qq.com> Date: Fri, 15 Mar 2019 10:01:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=93=E9=87=8D=E8=90=A5=E5=85=BB=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E6=8E=A5=E5=8F=A3=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/PatientWeightController.java | 2 - .../web/service/impl/PatientWeightServiceImpl.java | 46 +++++++--------------- 2 files changed, 14 insertions(+), 34 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java index 16ad520..c64b48c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java @@ -271,8 +271,6 @@ public class PatientWeightController extends BaseController { if (pid.isEmpty() || "null".equals(pid)) { return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.USER_PASSWORD_ERROR).setErrormsg("pid值不能为空!"); } - Integer ss = getUserId(request); - System.out.println("sss:" + ss); return patientWeightService.getWeightsReport(pid, getUserId(request), rid); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index 0b53ddd..1647f60 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -1965,16 +1965,16 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(patientWeight.getPatientId())), Patients.class); //1.1获取到这孕妇所有的高危因素id //1.2获取身高 - String height = patientWeight.getBeforeHeight(); + /* String height = patientWeight.getBeforeHeight(); //获取体重 - String weight = patientWeight.getBeforeWeight(); - Double heights = Double.valueOf(height).doubleValue() / 100; + String weight = patientWeight.getBeforeWeight();*/ + Double heights = Double.valueOf(patientWeight.getBeforeHeight()).doubleValue() / 100; int week = DateUtil.getWeek2(patients.getLastMenses(), new Date()); this.getAcuteHepatitis(heights, week); //获取胎数 String bregmatic = patientWeight.getBregmatic(); //获取bmi值 - Double bmiD = Double.valueOf(this.getBmi(weight, height)).doubleValue(); + Double bmiD = Double.valueOf(this.getBmi(patientWeight.getBeforeWeight(), patientWeight.getBeforeHeight())).doubleValue(); String bmiStr = ""; //空和1表示单胎 if (!org.apache.commons.lang.StringUtils.isNotEmpty(bregmatic) || "1".equals(bregmatic)) { @@ -2161,17 +2161,6 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(this.getFirstOrNull(datas)); } - private static String getKeyOrNull(Map map) { - String obj = null; - for (Map.Entry entry : map.entrySet()) { - obj = entry.getKey(); - if (obj != null) { - break; - } - } - return obj; - } - //获取第一个map中数据值 private static Object getFirstOrNull(Map> map) { Object obj = null; @@ -2189,15 +2178,15 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient setReport(data, weights, patientWeight.getBeforeWeight(), patientWeight.getBmi(), patientWeight.getDayWeights(), patientWeight.getBregmatic()); Map userMap = new HashMap(); userMap.put("userName", patients.getUsername()); - userMap.put("age", patients.getAge()); - userMap.put("height", patientWeight.getBeforeHeight()); + userMap.put("age", patients.getAge() + "岁"); + userMap.put("height", patientWeight.getBeforeHeight() + "cm"); userMap.put("bmi", bmi); userMap.put("week", week); userMap.put("vcCardNo", patients.getVcCardNo()); userMap.put("phone", patients.getPhone()); userMap.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate())); - userMap.put("NowWeight", patientWeight.getNowWeight()); - userMap.put("BeforeWeight", patientWeight.getBeforeWeight()); + userMap.put("NowWeight", patientWeight.getNowWeight() + "kg"); + userMap.put("BeforeWeight", patientWeight.getBeforeWeight() + "kg"); userMap.put("riskFactor", set); data.put("userInfo", userMap); Map map2 = new HashMap(); @@ -2212,7 +2201,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } if (null != weightReportModel.getWeeks() && weightReportModel.getWeeks() == week) { Map map = new HashMap(); - map.put("weeks", weightReportModel.getWeeks()); + map.put("weeks", "孕" + weightReportModel.getWeeks() + "周"); map.put("becareful", weightReportModel.getBecareful()); data.put("attentionWeek", map); } @@ -2250,15 +2239,15 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient setReport(data, weights, patientWeight.getBeforeWeight(), patientWeight.getBmi(), patientWeight.getDayWeights(), patientWeight.getBregmatic()); Map userMap = new HashMap(); userMap.put("userName", patients.getUsername()); - userMap.put("age", patients.getAge()); - userMap.put("height", patientWeight.getBeforeHeight()); + userMap.put("age", patients.getAge() + "岁"); + userMap.put("height", patientWeight.getBeforeHeight() + "cm"); userMap.put("bmi", bmi); - userMap.put("week", week); + userMap.put("week", "孕" + week + "周"); userMap.put("vcCardNo", patients.getVcCardNo()); userMap.put("phone", patients.getPhone()); userMap.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate())); - userMap.put("NowWeight", patientWeight.getNowWeight()); - userMap.put("BeforeWeight", patientWeight.getBeforeWeight()); + userMap.put("NowWeight", patientWeight.getNowWeight() + "kg"); + userMap.put("BeforeWeight", patientWeight.getBeforeWeight() + "kg"); userMap.put("riskFactor", set); data.put("userInfo", userMap); Map map2 = new HashMap(); @@ -2848,11 +2837,4 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient return 0.0; } - public static void main(String[] args) { - if (true) { - System.out.println("=========>" + true); - } else if (true) { - System.out.println("6666666666666666"); - } - } } -- 1.8.3.1