jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 368324b921acc654a0f03745dc2d717f50b3a1fc

Authored by wangbo
1 parent e95451d5e8
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

体重营养报告接口功能修改

Showing 2 changed files with 14 additions and 34 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java View file @ 368324b
... ... @@ -271,8 +271,6 @@
271 271 if (pid.isEmpty() || "null".equals(pid)) {
272 272 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.USER_PASSWORD_ERROR).setErrormsg("pid值不能为空!");
273 273 }
274   - Integer ss = getUserId(request);
275   - System.out.println("sss:" + ss);
276 274 return patientWeightService.getWeightsReport(pid, getUserId(request), rid);
277 275 }
278 276  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java View file @ 368324b
... ... @@ -1965,16 +1965,16 @@
1965 1965 Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(patientWeight.getPatientId())), Patients.class);
1966 1966 //1.1获取到这孕妇所有的高危因素id
1967 1967 //1.2获取身高
1968   - String height = patientWeight.getBeforeHeight();
  1968 + /* String height = patientWeight.getBeforeHeight();
1969 1969 //获取体重
1970   - String weight = patientWeight.getBeforeWeight();
1971   - Double heights = Double.valueOf(height).doubleValue() / 100;
  1970 + String weight = patientWeight.getBeforeWeight();*/
  1971 + Double heights = Double.valueOf(patientWeight.getBeforeHeight()).doubleValue() / 100;
1972 1972 int week = DateUtil.getWeek2(patients.getLastMenses(), new Date());
1973 1973 this.getAcuteHepatitis(heights, week);
1974 1974 //获取胎数
1975 1975 String bregmatic = patientWeight.getBregmatic();
1976 1976 //获取bmi值
1977   - Double bmiD = Double.valueOf(this.getBmi(weight, height)).doubleValue();
  1977 + Double bmiD = Double.valueOf(this.getBmi(patientWeight.getBeforeWeight(), patientWeight.getBeforeHeight())).doubleValue();
1978 1978 String bmiStr = "";
1979 1979 //空和1表示单胎
1980 1980 if (!org.apache.commons.lang.StringUtils.isNotEmpty(bregmatic) || "1".equals(bregmatic)) {
... ... @@ -2161,17 +2161,6 @@
2161 2161 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(this.getFirstOrNull(datas));
2162 2162 }
2163 2163  
2164   - private static String getKeyOrNull(Map<String, Object> map) {
2165   - String obj = null;
2166   - for (Map.Entry<String, Object> entry : map.entrySet()) {
2167   - obj = entry.getKey();
2168   - if (obj != null) {
2169   - break;
2170   - }
2171   - }
2172   - return obj;
2173   - }
2174   -
2175 2164 //获取第一个map中数据值
2176 2165 private static Object getFirstOrNull(Map<String, Map<String, Object>> map) {
2177 2166 Object obj = null;
2178 2167  
... ... @@ -2189,15 +2178,15 @@
2189 2178 setReport(data, weights, patientWeight.getBeforeWeight(), patientWeight.getBmi(), patientWeight.getDayWeights(), patientWeight.getBregmatic());
2190 2179 Map userMap = new HashMap();
2191 2180 userMap.put("userName", patients.getUsername());
2192   - userMap.put("age", patients.getAge());
2193   - userMap.put("height", patientWeight.getBeforeHeight());
  2181 + userMap.put("age", patients.getAge() + "岁");
  2182 + userMap.put("height", patientWeight.getBeforeHeight() + "cm");
2194 2183 userMap.put("bmi", bmi);
2195 2184 userMap.put("week", week);
2196 2185 userMap.put("vcCardNo", patients.getVcCardNo());
2197 2186 userMap.put("phone", patients.getPhone());
2198 2187 userMap.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate()));
2199   - userMap.put("NowWeight", patientWeight.getNowWeight());
2200   - userMap.put("BeforeWeight", patientWeight.getBeforeWeight());
  2188 + userMap.put("NowWeight", patientWeight.getNowWeight() + "kg");
  2189 + userMap.put("BeforeWeight", patientWeight.getBeforeWeight() + "kg");
2201 2190 userMap.put("riskFactor", set);
2202 2191 data.put("userInfo", userMap);
2203 2192 Map map2 = new HashMap();
... ... @@ -2212,7 +2201,7 @@
2212 2201 }
2213 2202 if (null != weightReportModel.getWeeks() && weightReportModel.getWeeks() == week) {
2214 2203 Map map = new HashMap();
2215   - map.put("weeks", weightReportModel.getWeeks());
  2204 + map.put("weeks", "孕" + weightReportModel.getWeeks() + "周");
2216 2205 map.put("becareful", weightReportModel.getBecareful());
2217 2206 data.put("attentionWeek", map);
2218 2207 }
2219 2208  
2220 2209  
... ... @@ -2250,15 +2239,15 @@
2250 2239 setReport(data, weights, patientWeight.getBeforeWeight(), patientWeight.getBmi(), patientWeight.getDayWeights(), patientWeight.getBregmatic());
2251 2240 Map userMap = new HashMap();
2252 2241 userMap.put("userName", patients.getUsername());
2253   - userMap.put("age", patients.getAge());
2254   - userMap.put("height", patientWeight.getBeforeHeight());
  2242 + userMap.put("age", patients.getAge() + "岁");
  2243 + userMap.put("height", patientWeight.getBeforeHeight() + "cm");
2255 2244 userMap.put("bmi", bmi);
2256   - userMap.put("week", week);
  2245 + userMap.put("week", "孕" + week + "周");
2257 2246 userMap.put("vcCardNo", patients.getVcCardNo());
2258 2247 userMap.put("phone", patients.getPhone());
2259 2248 userMap.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate()));
2260   - userMap.put("NowWeight", patientWeight.getNowWeight());
2261   - userMap.put("BeforeWeight", patientWeight.getBeforeWeight());
  2249 + userMap.put("NowWeight", patientWeight.getNowWeight() + "kg");
  2250 + userMap.put("BeforeWeight", patientWeight.getBeforeWeight() + "kg");
2262 2251 userMap.put("riskFactor", set);
2263 2252 data.put("userInfo", userMap);
2264 2253 Map map2 = new HashMap();
... ... @@ -2848,12 +2837,5 @@
2848 2837 return 0.0;
2849 2838 }
2850 2839  
2851   - public static void main(String[] args) {
2852   - if (true) {
2853   - System.out.println("=========>" + true);
2854   - } else if (true) {
2855   - System.out.println("6666666666666666");
2856   - }
2857   - }
2858 2840 }