Commit cd77f4d26ef6382f3bccee928d10873250dff75c
1 parent
070d5f4335
Exists in
master
and in
6 other branches
大同档案增加字段
Showing 1 changed file with 7 additions and 7 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
cd77f4d
... | ... | @@ -479,17 +479,17 @@ |
479 | 479 | map.put("LevelType",getBasicConfig(data.getLevelTypeId())); |
480 | 480 | map.put("marriageStatus",data.getMarriageStatus() == null ? "" : data.getMarriageStatus() == 1 ? "初婚" : (data.getMarriageStatus() == 2 ? "再婚" : "其他")); |
481 | 481 | map.put("marriageCheck",data.getMarriageCheck() == null ? "" : data.getMarriageCheck() == 1 ? "是" : "否"); |
482 | - String contraceptionType = ""; | |
482 | + StringBuilder sb = new StringBuilder(); | |
483 | 483 | if (data.getContraceptionType() != null) |
484 | 484 | { |
485 | - StringBuilder sb = new StringBuilder(); | |
485 | + | |
486 | 486 | sb.append(data.getContraceptionType().get(0).get("wby") == true ? "未避孕 " : ""); |
487 | - sb.append(data.getContraceptionType().get(0).get("kfbyy") == true ? "口服避孕药 " : ""); | |
488 | - sb.append(data.getContraceptionType().get(0).get("byt") == true ? "避孕套 " : ""); | |
489 | - sb.append(data.getContraceptionType().get(0).get("bym") == true ? "避孕膜 " : ""); | |
490 | - sb.append(data.getContraceptionType().get(0).get("qt") == true ? data.getContraceptionOther()+" " : ""); | |
487 | + sb.append(data.getContraceptionType().get(1).get("kfbyy") == true ? "口服避孕药 " : ""); | |
488 | + sb.append(data.getContraceptionType().get(2).get("byt") == true ? "避孕套 " : ""); | |
489 | + sb.append(data.getContraceptionType().get(3).get("bym") == true ? "避孕膜 " : ""); | |
490 | + sb.append(data.getContraceptionType().get(4).get("qt") == true ? data.getContraceptionOther()+" " : ""); | |
491 | 491 | } |
492 | - map.put("contraceptionType",contraceptionType); | |
492 | + map.put("contraceptionType",sb.toString()); | |
493 | 493 | map.put("hmarriageStatus",data.getHmarriageStatus() == null ? "" : data.getHmarriageStatus() == 1 ? "初婚" : (data.getHmarriageStatus() == 2 ? "再婚" : "其他")); |
494 | 494 | map.put("healthStatus",data.getHealthStatus()); |
495 | 495 | map.put("smoke",data.getSmoke() == null ? "" : data.getSmoke() == 1 ? "否" : "是"); |