Commit 443a3e00204baf07f67e0dab0540e04a2b8b030e

Authored by liquanyu
1 parent cd77f4d26e

大同档案增加字段

Showing 1 changed file with 1 additions and 1 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 443a3e0
... ... @@ -493,7 +493,7 @@
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 ? "否" : "是");
496   - map.put("smokeNum",(data.getSmoke() == null && data.getSmoke() == 2) ? data.getSmokeNum() : "");
  496 + map.put("smokeNum",(data.getSmoke() != null && data.getSmoke() == 2) ? data.getSmokeNum() : "");
497 497 map.put("drinkWine",data.getDrinkWine() == null ? "" : data.getDrinkWine() == 1 ? "偶尔" : (data.getDrinkWine() == 2 ? "经常" : "否"));
498 498 map.put("hLevelType",getBasicConfig(data.getHlevelTypeId()));
499 499 map.put("pastHistory",data.getPastHistory() == null ? "" : data.getPastHistory());