Commit 93ea17210faadc27973c8a41dfb9bd0597f443c1
1 parent
ee0946da3e
Exists in
master
and in
6 other branches
隆化-妇女健康管理系统需求-显示正常异常bug
Showing 1 changed file with 22 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
View file @
93ea172
| ... | ... | @@ -2342,9 +2342,9 @@ |
| 2342 | 2342 | checkupResult.setBianSe(bianSe); |
| 2343 | 2343 | |
| 2344 | 2344 | //甲状腺(1: 异常 2: 正常) |
| 2345 | - checkupResult.setJiaZhuangXian(itemHandle(result.getJiaZhuangXian(), result.getJiaZhuangXianDetails())); | |
| 2345 | + checkupResult.setJiaZhuangXian(itemHandle2(result.getJiaZhuangXian(), result.getJiaZhuangXianDetails())); | |
| 2346 | 2346 | checkupResult.setXiongKuo(itemHandle(result.getXiongKuo(), result.getXiongKuoDetails())); |
| 2347 | - checkupResult.setFei(itemHandle(result.getFei(), result.getFeiDetails())); | |
| 2347 | + checkupResult.setFei(itemHandle2(result.getFei(), result.getFeiDetails())); | |
| 2348 | 2348 | checkupResult.setHeartRate(UnitHandle(result.getHeartRate(), UnitConstants.CIFEN)); |
| 2349 | 2349 | checkupResult.setHeartRhythm(StringUtils.isNotEmpty(result.getHeartRhythm()) ? result.getHeartRhythm() : ""); |
| 2350 | 2350 | checkupResult.setZaYin(itemHandle(result.getZaYin(), result.getZaYinDetails())); |
| ... | ... | @@ -2373,7 +2373,7 @@ |
| 2373 | 2373 | |
| 2374 | 2374 | if (StringUtils.isNotEmpty(result.getjBa())) { |
| 2375 | 2375 | //男性生殖器 |
| 2376 | - checkupResult.setjBa(itemHandle(Integer.valueOf(result.getjBa()), result.getjBaDetails())); | |
| 2376 | + checkupResult.setjBa(itemHandle2(Integer.valueOf(result.getjBa()), result.getjBaDetails())); | |
| 2377 | 2377 | } |
| 2378 | 2378 | |
| 2379 | 2379 | //包皮(1: 正常 2：过长 3：包茎 ) |
| ... | ... | @@ -2438,7 +2438,7 @@ |
| 2438 | 2438 | checkupResult.setShengZhiQiTa(result.getShengZhiQiTa()); |
| 2439 | 2439 | |
| 2440 | 2440 | //女性生殖器 |
| 2441 | - checkupResult.setRuFangFaYu(itemHandle(result.getRuFangFaYu(), result.getRuFangFaYuDetails())); | |
| 2441 | + checkupResult.setRuFangFaYu(itemHandle2(result.getRuFangFaYu(), result.getRuFangFaYuDetails())); | |
| 2442 | 2442 | checkupResult.setGcWaiYin(result.getGcWaiYin()); |
| 2443 | 2443 | checkupResult.setGcFenMiWu(result.getGcFenMiWu()); |
| 2444 | 2444 | checkupResult.setGcZiGong(result.getGcZiGong()); |
| ... | ... | @@ -3204,6 +3204,24 @@ |
| 3204 | 3204 | } |
| 3205 | 3205 | if (status != null && status == 2) { |
| 3206 | 3206 | result += "无"; |
| 3207 | + } | |
| 3208 | + return result; | |
| 3209 | + } | |
| 3210 | + | |
| 3211 | + private String itemHandle2(Integer status, String detail) { | |
| 3212 | + String result = ""; | |
| 3213 | + if (status != null && status == 1) { | |
| 3214 | + result += "异常"; | |
| 3215 | + String content = ""; | |
| 3216 | + if (detail != null) { | |
| 3217 | + content = strPj(content, detail); | |
| 3218 | + } | |
| 3219 | + if (StringUtils.isNotEmpty(content)) { | |
| 3220 | + result += content; | |
| 3221 | + } | |
| 3222 | + } | |
| 3223 | + if (status != null && status == 2) { | |
| 3224 | + result += "正常"; | |
| 3207 | 3225 | } |
| 3208 | 3226 | return result; |
| 3209 | 3227 | } |