From ca9ac9b5b6a85f8ffddbf5b89f4d3b0aabd88992 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 15 Sep 2020 09:14:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=90=8C=E6=A1=A3=E6=A1=88=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/operate/web/facade/ViewFacade.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 8936a1e..388ba31 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -483,11 +483,11 @@ public class ViewFacade { if (data.getContraceptionType() != null && data.getContraceptionType().size() > 0) { - sb.append(data.getContraceptionType().get("wby") == true ? "未避孕 " : ""); - sb.append(data.getContraceptionType().get("kfbyy") == true ? "口服避孕药 " : ""); - sb.append(data.getContraceptionType().get("byt") == true ? "避孕套 " : ""); - sb.append(data.getContraceptionType().get("bym") == true ? "避孕膜 " : ""); - sb.append(data.getContraceptionType().get("qt") == true ? data.getContraceptionOther()+" " : ""); + sb.append(data.getContraceptionType().get("wby") != null && data.getContraceptionType().get("wby") == true ? "未避孕 " : ""); + sb.append(data.getContraceptionType().get("kfby") != null && data.getContraceptionType().get("kfby") == true ? "口服避孕药 " : ""); + sb.append(data.getContraceptionType().get("byt") != null && data.getContraceptionType().get("byt") == true ? "避孕套 " : ""); + sb.append(data.getContraceptionType().get("bym") != null && data.getContraceptionType().get("bym") == true ? "避孕膜 " : ""); + sb.append(data.getContraceptionType().get("qt") != null && data.getContraceptionType().get("qt") == true ? data.getContraceptionOther()+" " : ""); } map.put("contraceptionType",sb.toString()); map.put("hmarriageStatus",data.getHmarriageStatus() == null ? "" : data.getHmarriageStatus() == 1 ? "初婚" : (data.getHmarriageStatus() == 2 ? "再婚" : "其他")); -- 1.8.3.1