Commit ca9ac9b5b6a85f8ffddbf5b89f4d3b0aabd88992
1 parent
0c1229fe93
Exists in
master
and in
6 other branches
大同档案增加字段
Showing 1 changed file with 5 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
ca9ac9b
... | ... | @@ -483,11 +483,11 @@ |
483 | 483 | if (data.getContraceptionType() != null && data.getContraceptionType().size() > 0) |
484 | 484 | { |
485 | 485 | |
486 | - sb.append(data.getContraceptionType().get("wby") == true ? "未避孕 " : ""); | |
487 | - sb.append(data.getContraceptionType().get("kfbyy") == true ? "口服避孕药 " : ""); | |
488 | - sb.append(data.getContraceptionType().get("byt") == true ? "避孕套 " : ""); | |
489 | - sb.append(data.getContraceptionType().get("bym") == true ? "避孕膜 " : ""); | |
490 | - sb.append(data.getContraceptionType().get("qt") == true ? data.getContraceptionOther()+" " : ""); | |
486 | + sb.append(data.getContraceptionType().get("wby") != null && data.getContraceptionType().get("wby") == true ? "未避孕 " : ""); | |
487 | + sb.append(data.getContraceptionType().get("kfby") != null && data.getContraceptionType().get("kfby") == true ? "口服避孕药 " : ""); | |
488 | + sb.append(data.getContraceptionType().get("byt") != null && data.getContraceptionType().get("byt") == true ? "避孕套 " : ""); | |
489 | + sb.append(data.getContraceptionType().get("bym") != null && data.getContraceptionType().get("bym") == true ? "避孕膜 " : ""); | |
490 | + sb.append(data.getContraceptionType().get("qt") != null && data.getContraceptionType().get("qt") == true ? data.getContraceptionOther()+" " : ""); | |
491 | 491 | } |
492 | 492 | map.put("contraceptionType",sb.toString()); |
493 | 493 | map.put("hmarriageStatus",data.getHmarriageStatus() == null ? "" : data.getHmarriageStatus() == 1 ? "初婚" : (data.getHmarriageStatus() == 2 ? "再婚" : "其他")); |