Commit c2da500147fef14f0e488574e762d8d0a75bb269
1 parent
b6ebf2b696
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/TrackDownFacade.java
View file @
c2da500
| ... | ... | @@ -689,7 +689,7 @@ |
| 689 | 689 | // 追访时间 |
| 690 | 690 | temp.put("trackDownTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate())); |
| 691 | 691 | // 预约时间 |
| 692 | - temp.put("yyTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate())); | |
| 692 | + temp.put("yyTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getAppointmentDate())); | |
| 693 | 693 | |
| 694 | 694 | |
| 695 | 695 | //预约复查时间默认用追访时间 |
| ... | ... | @@ -778,7 +778,7 @@ |
| 778 | 778 | // 追访时间 |
| 779 | 779 | temp.put("trackDownTime", trackDown.getTrackDownDate() == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate())); |
| 780 | 780 | // 预约时间 |
| 781 | - temp.put("yyTime", trackDown.getReservatDate() == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate())); | |
| 781 | + temp.put("yyTime", trackDown.getReservatDate() == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getAppointmentDate())); | |
| 782 | 782 | //访视次数 |
| 783 | 783 | temp.put("trackCount", trackDowns.size()); |
| 784 | 784 | } |
| ... | ... | @@ -814,7 +814,7 @@ |
| 814 | 814 | // 婚检追访时间 |
| 815 | 815 | temp.put("trackDownTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate())); |
| 816 | 816 | // 预约时间 |
| 817 | - temp.put("yyTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate())); | |
| 817 | + temp.put("yyTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getAppointmentDate())); | |
| 818 | 818 | //孕妇建档日期 |
| 819 | 819 | temp.put("womanCreatedTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getCreated())); |
| 820 | 820 | return temp; |
| ... | ... | @@ -845,7 +845,7 @@ |
| 845 | 845 | // 婚检追访时间 |
| 846 | 846 | temp.put("trackDownTime", CollectionUtils.isEmpty(trackDown) ? "--" : DateUtil.getyyyy_MM_dd(trackDown.get(0).getTrackDownDate())); |
| 847 | 847 | // 预约时间 |
| 848 | - temp.put("yyTime", CollectionUtils.isEmpty(trackDown) ? "--" : DateUtil.getyyyy_MM_dd(trackDown.get(0).getReservatDate())); | |
| 848 | + temp.put("yyTime", CollectionUtils.isEmpty(trackDown) ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getAppointmentDate())); | |
| 849 | 849 | |
| 850 | 850 | |
| 851 | 851 | //Long checkNum = mongoTemplate.count(Query.query(Criteria.where("certificateNum").is(archiveModel.getCertificateNum()).and("hospitalId").is(archiveModel.getHospitalId()).and("yn").is(1)), PremaritalCheckup.class); |
| ... | ... | @@ -913,7 +913,7 @@ |
| 913 | 913 | if (trackDown != null) { |
| 914 | 914 | temp.put("result", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult()); // 追访结果 |
| 915 | 915 | temp.put("trackDownTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate())); // 追访时间 |
| 916 | - temp.put("yyzfTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate())); // 预约时间 | |
| 916 | + temp.put("yyzfTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getAppointmentDate())); // 预约时间 | |
| 917 | 917 | } else { |
| 918 | 918 | temp.put("result", "--"); // 婚检追访结果 |
| 919 | 919 | temp.put("trackDownTime", "--"); // 追访时间 |