diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java index a1310ac..c6ac43e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java @@ -123,29 +123,34 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye } } } - StringBuilder r = new StringBuilder(); + StringBuilder refractometer = new StringBuilder(); if(StringUtils.isNotEmpty(babyEyeCheck.getR1())) { - r.append("R:S( ").append(babyEyeCheck.getR1()).append( " ) "); + refractometer.append("R:S( ").append(babyEyeCheck.getR1()).append( " )"); } if(StringUtils.isNotEmpty(babyEyeCheck.getR2())) { - r.append("R:DC( ").append(babyEyeCheck.getR1()).append( " )D "); + if(refractometer.length() != 0) { + refractometer.append(" "); + } + refractometer.append("R:DC( ").append(babyEyeCheck.getR1()).append( " )"); } - StringBuilder l = new StringBuilder(); + boolean flag = false; if(StringUtils.isNotEmpty(babyEyeCheck.getL1())) { - l.append("L:S( ").append(babyEyeCheck.getR1()).append( " )D "); + if(refractometer.length() != 0) { + refractometer.append(", "); + flag = true; + } + refractometer.append("L:S( ").append(babyEyeCheck.getR1()).append( " )"); } if(StringUtils.isNotEmpty(babyEyeCheck.getL2())) { - l.append("L:DC( ").append(babyEyeCheck.getR1()).append( " ) D"); - } - String refractometer = new String(); - if(r.length() != 0 && l.length() != 0) { - refractometer = r.toString() + "," + l.toString(); - } else if(r.length() == 0) { - refractometer = l.toString(); - } else if(l.length() == 0) { - refractometer = r.toString(); + if(!flag) { + if(StringUtils.isNotEmpty(babyEyeCheck.getR1()) || StringUtils.isNotEmpty(babyEyeCheck.getR2())) { + refractometer.append(", "); + } + } + refractometer.append("L:DC( ").append(babyEyeCheck.getR1()).append( " )"); } - map.put("refractometer", refractometer); + + map.put("refractometer", refractometer.toString()); map.put("riskFactorId", riskFactorNames); map.put("checkMonthId", CheckMonthEnums.getName(babyEyeCheck.getCheckMonthId()));