Commit fb945686eb3742c53696b20c1103676c88ce6599
1 parent
905308d346
Exists in
master
and in
6 other branches
追访概况中的孕妇分娩和产后复查
Showing 1 changed file with 3 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java
View file @
fb94568
| ... | ... | @@ -355,21 +355,21 @@ |
| 355 | 355 | |
| 356 | 356 | if ((int) map.get("cqsc") == 3) {//产前筛查 |
| 357 | 357 | //如果当前流程已经结束流程，则显示X |
| 358 | - if (trackDownRecord.getTrackType() > TrackDownDateEnums.C.getId()) { | |
| 358 | + if (trackDownRecord.getTrackType()!=9&&trackDownRecord.getTrackType() > TrackDownDateEnums.C.getId()) { | |
| 359 | 359 | map.put("cqsc", 2); |
| 360 | 360 | } |
| 361 | 361 | } |
| 362 | 362 | |
| 363 | 363 | if ((int) map.get("fm") == 3) {//分娩 |
| 364 | 364 | //如果当前流程已经结束流程，则显示X |
| 365 | - if (trackDownRecord.getTrackType() > TrackDownDateEnums.E.getId()) { | |
| 365 | + if (trackDownRecord.getTrackType() != 8&&trackDownRecord.getTrackType() != 9&&trackDownRecord.getTrackType() > TrackDownDateEnums.E.getId()) { | |
| 366 | 366 | map.put("fm", 2); |
| 367 | 367 | } |
| 368 | 368 | } |
| 369 | 369 | |
| 370 | 370 | if ((int) map.get("chfc") == 3) {//产后复查 |
| 371 | 371 | //如果当前流程已经结束流程，则显示X |
| 372 | - if (trackDownRecord.getTrackType() > TrackDownDateEnums.F.getId()) { | |
| 372 | + if (trackDownRecord.getTrackType() != 8&&trackDownRecord.getTrackType() != 9&&trackDownRecord.getTrackType() > TrackDownDateEnums.F.getId()) { | |
| 373 | 373 | map.put("chfc", 2); |
| 374 | 374 | } |
| 375 | 375 | } |