diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index 704dee6..b7cb328 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -2342,9 +2342,9 @@ public class PremaritalCheckupFacade { checkupResult.setBianSe(bianSe); //甲状腺(1: 异常 2: 正常) - checkupResult.setJiaZhuangXian(itemHandle(result.getJiaZhuangXian(), result.getJiaZhuangXianDetails())); + checkupResult.setJiaZhuangXian(itemHandle2(result.getJiaZhuangXian(), result.getJiaZhuangXianDetails())); checkupResult.setXiongKuo(itemHandle(result.getXiongKuo(), result.getXiongKuoDetails())); - checkupResult.setFei(itemHandle(result.getFei(), result.getFeiDetails())); + checkupResult.setFei(itemHandle2(result.getFei(), result.getFeiDetails())); checkupResult.setHeartRate(UnitHandle(result.getHeartRate(), UnitConstants.CIFEN)); checkupResult.setHeartRhythm(StringUtils.isNotEmpty(result.getHeartRhythm()) ? result.getHeartRhythm() : ""); checkupResult.setZaYin(itemHandle(result.getZaYin(), result.getZaYinDetails())); @@ -2373,7 +2373,7 @@ public class PremaritalCheckupFacade { if (StringUtils.isNotEmpty(result.getjBa())) { //男性生殖器 - checkupResult.setjBa(itemHandle(Integer.valueOf(result.getjBa()), result.getjBaDetails())); + checkupResult.setjBa(itemHandle2(Integer.valueOf(result.getjBa()), result.getjBaDetails())); } //包皮(1: 正常 2:过长 3:包茎 ) @@ -2438,7 +2438,7 @@ public class PremaritalCheckupFacade { checkupResult.setShengZhiQiTa(result.getShengZhiQiTa()); //女性生殖器 - checkupResult.setRuFangFaYu(itemHandle(result.getRuFangFaYu(), result.getRuFangFaYuDetails())); + checkupResult.setRuFangFaYu(itemHandle2(result.getRuFangFaYu(), result.getRuFangFaYuDetails())); checkupResult.setGcWaiYin(result.getGcWaiYin()); checkupResult.setGcFenMiWu(result.getGcFenMiWu()); checkupResult.setGcZiGong(result.getGcZiGong()); @@ -3208,6 +3208,24 @@ public class PremaritalCheckupFacade { return result; } + private String itemHandle2(Integer status, String detail) { + String result = ""; + if (status != null && status == 1) { + result += "异常"; + String content = ""; + if (detail != null) { + content = strPj(content, detail); + } + if (StringUtils.isNotEmpty(content)) { + result += content; + } + } + if (status != null && status == 2) { + result += "正常"; + } + return result; + } + private String handleYY(String yy) { String result = ""; if ("yang".equals(yy)) {