Commit d41a11c7464534560b7a239e744d80ffbe7357ec
1 parent
da5a7834ac
Exists in
master
and in
6 other branches
追访记录
Showing 1 changed file with 14 additions and 17 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java
View file @
d41a11c
| ... | ... | @@ -353,8 +353,6 @@ |
| 353 | 353 | } |
| 354 | 354 | calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMinimum(Calendar.DAY_OF_MONTH)); |
| 355 | 355 | Date end = calendar.getTime(); |
| 356 | - System.out.println("start::"+DateUtil.getyyyy_MM_dd_hms(start)); | |
| 357 | - System.out.println("end::"+DateUtil.getyyyy_MM_dd_hms(end)); | |
| 358 | 356 | query.addCriteria(Criteria.where("birth").gte(end).lte(start)); |
| 359 | 357 | } |
| 360 | 358 | |
| 361 | 359 | |
| 362 | 360 | |
| 363 | 361 | |
| 364 | 362 | |
| 365 | 363 | |
| 366 | 364 | |
| 367 | 365 | |
| 368 | 366 | |
| 369 | 367 | |
| ... | ... | @@ -450,41 +448,40 @@ |
| 450 | 448 | |
| 451 | 449 | // 追访时间 |
| 452 | 450 | Date afterVisitTime = model.getAfterVisitTime(); |
| 453 | - if (afterVisitTime != null) { | |
| 454 | - objectMap.put("afterVisitTimeStr", DateUtil.getyyyy_MM_dd(afterVisitTime)); | |
| 455 | - } | |
| 451 | + String afterVisitTimeStr = afterVisitTime == null ? "" : DateUtil.getyyyy_MM_dd(afterVisitTime); | |
| 452 | + objectMap.put("afterVisitTimeStr", afterVisitTimeStr); | |
| 456 | 453 | // 追访人 |
| 457 | 454 | String afterVisitUser = model.getAfterVisitUser(); |
| 455 | + String afterVisitUserStr = ""; | |
| 458 | 456 | if (StringUtils.isNotEmpty(afterVisitUser)) { |
| 459 | 457 | Users users = usersMapper.getUsers(Integer.parseInt(afterVisitUser)); |
| 460 | 458 | if (users != null) { |
| 461 | - objectMap.put("afterVisitUserStr", users.getName()); | |
| 459 | + afterVisitUserStr = users.getName(); | |
| 462 | 460 | } |
| 463 | 461 | } |
| 462 | + objectMap.put("afterVisitUserStr", afterVisitUserStr); | |
| 464 | 463 | // 阳性项目 |
| 465 | 464 | String positives = model.getPositiveProject(); |
| 466 | - if (StringUtils.isNotEmpty(positives)) { | |
| 467 | - objectMap.put("positiveProjectStr", positives); | |
| 468 | - } | |
| 465 | + String positiveProjectStr = StringUtils.isNotEmpty(positives) ? positives : ""; | |
| 466 | + objectMap.put("positiveProjectStr", positiveProjectStr); | |
| 469 | 467 | // 检查医生 |
| 470 | 468 | String doctor = model.getCheckDoctor(); |
| 469 | + String checkDoctorStr = ""; | |
| 471 | 470 | if (StringUtils.isNotEmpty(doctor)) { |
| 472 | 471 | Users users = usersMapper.getUsers(Integer.parseInt(doctor)); |
| 473 | 472 | if (users != null) { |
| 474 | - objectMap.put("checkDoctorStr", users.getName()); | |
| 473 | + checkDoctorStr = users.getName(); | |
| 475 | 474 | } |
| 476 | 475 | } |
| 476 | + objectMap.put("checkDoctorStr", checkDoctorStr); | |
| 477 | 477 | // 检查日期 |
| 478 | 478 | Date checkTime = model.getCheckTime(); |
| 479 | - if (checkTime != null) { | |
| 480 | - objectMap.put("checkTimeStr", DateUtil.getyyyy_MM_dd(checkTime)); | |
| 481 | - } | |
| 479 | + String checkTimeStr = checkTime == null ? "" : DateUtil.getyyyy_MM_dd(checkTime); | |
| 480 | + objectMap.put("checkTimeStr", checkTimeStr); | |
| 482 | 481 | // 诊断时间 |
| 483 | 482 | Date diagnosisTime = model.getDiagnosisTime(); |
| 484 | - if (diagnosisTime != null) { | |
| 485 | - objectMap.put("diagnosisTimeStr", DateUtil.getyyyy_MM_dd(diagnosisTime)); | |
| 486 | - } | |
| 487 | - | |
| 483 | + String diagnosisTimeStr = diagnosisTime == null ? "" : DateUtil.getyyyy_MM_dd(diagnosisTime); | |
| 484 | + objectMap.put("diagnosisTimeStr", diagnosisTimeStr); | |
| 488 | 485 | |
| 489 | 486 | mapList.add(objectMap); |
| 490 | 487 | } |