jiangjiazhi / regional-platform

Download as
Browse Code »

Commit a70c0cb3880c604d01baeba5a775e26d50e92255

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

新生儿评分

Showing 1 changed file with 3 additions and 2 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ a70c0cb
... ... @@ -1783,7 +1783,7 @@
1783 1783 java.text.DecimalFormat df = new java.text.DecimalFormat("#.#");
1784 1784 df.setRoundingMode(RoundingMode.FLOOR);
1785 1785 double tzzs = Double.parseDouble(data.getYqWeight()) / Math.pow(Double.parseDouble(data.getHeight()) / 100, 2);
1786   - System.out.println("tzzs==================" + tzzs+"");
  1786 + System.out.println("tzzs==================" + tzzs);
1787 1787 map.put("tzzs", df.format(tzzs));
1788 1788 } catch (Exception e) {
1789 1789 ExceptionUtils.catchException(e, "体重指数计算错误");
... ... @@ -2573,6 +2573,7 @@
2573 2573 babyMap.put("babyWeight", UnitUtils.unitSplice(temp.getBabyWeight(), UnitConstants.G));
2574 2574 babyMap.put("babyHeight", UnitUtils.unitSplice(temp.getBabyHeight(), UnitConstants.CM));
2575 2575 babyMap.put("babyHealthy", temp.getBabyHealthy());
  2576 + babyMap.put("apgarScoreMap", temp.getApgarScore());
2576 2577 String apgarScorePf1 = "";
2577 2578 String apgarScorePf5 = "";
2578 2579 String apgarScorePf10 = "";
... ... @@ -2584,7 +2585,7 @@
2584 2585 }
2585 2586 String apgarScore = "";
2586 2587  
2587   - if (StringUtils.isNotEmpty(apgarScorePf1) && StringUtils.isNotEmpty(apgarScorePf5) && StringUtils.isNotEmpty(apgarScorePf10)) {
  2588 + if (StringUtils.isNotEmpty(apgarScorePf1) || StringUtils.isNotEmpty(apgarScorePf5) || StringUtils.isNotEmpty(apgarScorePf10)) {
2588 2589 apgarScore = apgarScorePf1 + UnitConstants.FEN + " - " + apgarScorePf5 + UnitConstants.FEN + " - " + apgarScorePf10 + UnitConstants.FEN;
2589 2590 }
2590 2591 babyMap.put("apgarScore", apgarScore);