jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 93b7141adc0d31ba74f48411453839a75840a158

Authored by litao@lymsh.com
1 parent 8e61db9ef7
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

改字段

Showing 1 changed file with 20 additions and 15 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java View file @ 93b7141
... ... @@ -123,29 +123,34 @@
123 123 }
124 124 }
125 125 }
126   - StringBuilder r = new StringBuilder();
  126 + StringBuilder refractometer = new StringBuilder();
127 127 if(StringUtils.isNotEmpty(babyEyeCheck.getR1())) {
128   - r.append("R:S( ").append(babyEyeCheck.getR1()).append( " ) ");
  128 + refractometer.append("R:S( ").append(babyEyeCheck.getR1()).append( " )");
129 129 }
130 130 if(StringUtils.isNotEmpty(babyEyeCheck.getR2())) {
131   - r.append("R:DC( ").append(babyEyeCheck.getR1()).append( " )D ");
  131 + if(refractometer.length() != 0) {
  132 + refractometer.append(" ");
  133 + }
  134 + refractometer.append("R:DC( ").append(babyEyeCheck.getR1()).append( " )");
132 135 }
133   - StringBuilder l = new StringBuilder();
  136 + boolean flag = false;
134 137 if(StringUtils.isNotEmpty(babyEyeCheck.getL1())) {
135   - l.append("L:S( ").append(babyEyeCheck.getR1()).append( " )D ");
  138 + if(refractometer.length() != 0) {
  139 + refractometer.append(", ");
  140 + flag = true;
  141 + }
  142 + refractometer.append("L:S( ").append(babyEyeCheck.getR1()).append( " )");
136 143 }
137 144 if(StringUtils.isNotEmpty(babyEyeCheck.getL2())) {
138   - l.append("L:DC( ").append(babyEyeCheck.getR1()).append( " ) D");
  145 + if(!flag) {
  146 + if(StringUtils.isNotEmpty(babyEyeCheck.getR1()) || StringUtils.isNotEmpty(babyEyeCheck.getR2())) {
  147 + refractometer.append(", ");
  148 + }
  149 + }
  150 + refractometer.append("L:DC( ").append(babyEyeCheck.getR1()).append( " )");
139 151 }
140   - String refractometer = new String();
141   - if(r.length() != 0 && l.length() != 0) {
142   - refractometer = r.toString() + "," + l.toString();
143   - } else if(r.length() == 0) {
144   - refractometer = l.toString();
145   - } else if(l.length() == 0) {
146   - refractometer = r.toString();
147   - }
148   - map.put("refractometer", refractometer);
  152 +
  153 + map.put("refractometer", refractometer.toString());
149 154  
150 155 map.put("riskFactorId", riskFactorNames);
151 156 map.put("checkMonthId", CheckMonthEnums.getName(babyEyeCheck.getCheckMonthId()));