Commit 46ea4d8521b33160d984531e9d6ff65cdf7d5f30
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 1 changed file
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java
View file @
46ea4d8
| ... | ... | @@ -138,7 +138,7 @@ |
| 138 | 138 | } |
| 139 | 139 | else if (patients != null && patients.getType() == 1) |
| 140 | 140 | { |
| 141 | - start = DateUtil.getWeek(patients.getLastMenses(),new Date()); | |
| 141 | + start = DateUtil.getWeek2(patients.getLastMenses(), new Date()); | |
| 142 | 142 | } |
| 143 | 143 | } |
| 144 | 144 | else if (person.getType() == 2) |
| 145 | 145 | |
| ... | ... | @@ -197,9 +197,9 @@ |
| 197 | 197 | Integer showEnd = Integer.parseInt(map.get("show_end").toString()); |
| 198 | 198 | if ((showStart <= start && showEnd >= start) || showStart >= start) |
| 199 | 199 | { |
| 200 | - | |
| 200 | + list.add(map); | |
| 201 | 201 | } |
| 202 | - list.add(map); | |
| 202 | + | |
| 203 | 203 | } |
| 204 | 204 | } |
| 205 | 205 | } |