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 ? "再婚" : "其他"));