Commit 6ca265bcfdd8fedd451ebe2f8affab7d0e2b58f3
1 parent
3494bc2aae
Exists in
master
and in
6 other branches
改bug
Showing 1 changed file with 4 additions and 0 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
6ca265b
| ... | ... | @@ -750,6 +750,10 @@ |
| 750 | 750 | for (Patients p : patients) { |
| 751 | 751 | if(p.getId().equals(patientId)) { |
| 752 | 752 | for (Map<String, Object> map : entry.getValue()) { |
| 753 | + System.out.println(DateUtil.getyyyy_MM_dd_hms(p.getCreated()) + " >> " + DateUtil.getyyyy_MM_dd_hms(((Date) map.get("create_date")))); | |
| 754 | + if(p.getFmDate() != null && p.getFmDate().getTime() > ((Date) map.get("create_date")).getTime()) { // 如果手动终止妊娠了， 那么fmDate应该小于优惠券发放的时间 | |
| 755 | + continue; | |
| 756 | + } | |
| 753 | 757 | if(p.getCreated().getTime() > ((Date) map.get("create_date")).getTime()) { // 同一个产程中 patient的创建时间肯定小于优惠券的创建时间 |
| 754 | 758 | continue; |
| 755 | 759 | } |