Commit c968e0f16571f5bfe7cd3e1f260b3933d9309285
1 parent
ea8ee93551
Exists in
master
and in
2 other branches
两癌导出
Showing 1 changed file with 13 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java
View file @
c968e0f
| ... | ... | @@ -469,14 +469,21 @@ |
| 469 | 469 | model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService));//住址 |
| 470 | 470 | map.put("country", CommonsHelper.getResidence(null, null, |
| 471 | 471 | null, model.getStreetId(), null, basicConfigService));//住址 |
| 472 | - map.put("yc", model.getYc()); | |
| 473 | - map.put("cc", model.getFmc()); | |
| 472 | + | |
| 473 | + Map<String,Object> data = model.getFormData(); | |
| 474 | + map.put("yc", data.get("yunci")); | |
| 475 | + map.put("cc", data.get("chanci")); | |
| 474 | 476 | String juejing = ""; |
| 475 | - if (StringUtils.isNotEmpty(model.getJuejing())){ | |
| 476 | - juejing = "1".equals(model.getJuejing()) ? "否" : "是"; | |
| 477 | + if (data.get("juejin") != null){ | |
| 478 | + List<Object> jj = (ArrayList)data.get("juejin"); | |
| 479 | + if (jj.get(0) != null && StringUtils.isNotEmpty(String.valueOf(jj.get(0)))){ | |
| 480 | + juejing = Objects.equals("1", String.valueOf(jj.get(0))) ? "否" : "是"; | |
| 481 | + map.put("juejing", juejing); | |
| 482 | + map.put("juejingAge", jj.get(1)); | |
| 483 | + } | |
| 477 | 484 | } |
| 478 | - map.put("juejing", juejing); | |
| 479 | - map.put("juejingAge", model.getJuejingAge()); | |
| 485 | + | |
| 486 | + | |
| 480 | 487 | map.put("lastMenstrual", DateUtil.getyyyy_MM_dd(model.getLastMenstrual())); |
| 481 | 488 | |
| 482 | 489 | gjaList.add(map); |