jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 5256f0e76525c41d8c28c868b26101a5603e6c62

Authored by yangfei
2 parents c86cf01c5e 474637818c
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java View file @ 5256f0e
... ... @@ -496,9 +496,6 @@
496 496 {
497 497 return true;
498 498 }
499   -
500   -
501   -
502 499 Map<String,Object> map = getFirstBloodSugarDate(pid);
503 500 if (map.size() != 0)
504 501 {
... ... @@ -538,7 +535,7 @@
538 535 BloodSugarQuery buery = new BloodSugarQuery();
539 536 buery.setPid(pid);
540 537 buery.setCreatedStart(queryDate);
541   - buery.setCreatedEnd(DateUtil.formatDate(new Date()));
  538 + buery.setCreatedEnd(DateUtil.formatDate(DateUtil.addDay(DateUtil.formatDate(new Date()),7)));
542 539 List<BloodSugar> list = bloodSugarService.queryBloodSugarList(buery, Sort.Direction.DESC, "created");
543 540  
544 541 int size = list == null ? 0 : list.size();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java View file @ 5256f0e
... ... @@ -310,7 +310,16 @@
310 310 return RespBuilder.buildSuccess("建档数据未找到");
311 311 }
312 312 Map<String, Object> map = ReflectionUtils.beanToMap(patientWeight);
313   - map.put("bregmatic", BregmaticEnums2.getName(patientWeight.getBregmatic()));
  313 + String bregmatic = "";
  314 + if (StringUtils.isEmpty(patientWeight.getBregmatic()) || "null".equals(patientWeight.getBregmatic()))
  315 + {
  316 + bregmatic = "未知";
  317 + }
  318 + else
  319 + {
  320 + bregmatic = BregmaticEnums2.getName(patientWeight.getBregmatic());
  321 + }
  322 + map.put("bregmatic",bregmatic);
314 323 map.put("bim", patientWeight.getBmi()); // 体质指数（BMI）=体重（kg）÷身高^2（m）
315 324  
316 325 Map<String, String> dayWeights = patientWeight.getDayWeights();