Commit dba0c3278d796427520b95a2447820119218cc70
1 parent
dc199d0855
Exists in
master
and in
6 other branches
追访数据查看bug修改
Showing 1 changed file with 34 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java
View file @
dba0c32
| ... | ... | @@ -282,7 +282,6 @@ |
| 282 | 282 | private void updateRecordStatus(TrackDown trackDown, String id) { |
| 283 | 283 | //如果是扭转到下一个流程的话就需要修改record表 |
| 284 | 284 | if (TrackDownTransferEnums.B.getId() == trackDown.getTrackDownTransfer()) { |
| 285 | - | |
| 286 | 285 | TrackDownRecord trackDownRecord = new TrackDownRecord(); |
| 287 | 286 | Integer nextId = TrackDownDateEnums.getEnum(trackDown.getTrackDownDateType()).getNextid(); |
| 288 | 287 | trackDownRecord.setTrackType(nextId); |
| 289 | 288 | |
| 290 | 289 | |
| ... | ... | @@ -477,15 +476,48 @@ |
| 477 | 476 | chfsList.add(temp); |
| 478 | 477 | } else if (TrackDownDateEnums.G.getId().equals(trackDown.getTrackDownDateType())) { |
| 479 | 478 | chfcList.add(temp); |
| 479 | + } else if (TrackDownDateEnums.H.getId().equals(trackDown.getTrackDownDateType())) { | |
| 480 | + cqscList.add(temp); | |
| 481 | + } else if (TrackDownDateEnums.I.getId().equals(trackDown.getTrackDownDateType())) { | |
| 482 | + cqjcList.add(temp); | |
| 483 | + } else if (TrackDownDateEnums.J.getId().equals(trackDown.getTrackDownDateType())) { | |
| 484 | + chfcList.add(temp); | |
| 485 | + }else if (TrackDownDateEnums.K.getId().equals(trackDown.getTrackDownDateType())) { | |
| 486 | + chfsList.add(temp); | |
| 480 | 487 | } |
| 481 | 488 | } |
| 482 | 489 | return RespBuilder.buildSuccess("hqjcList", hqjcList, "hyjdList", hyjdList, "cqjcList", cqjcList, "cqscList", cqscList, "zyfmList", zyfmList, "chfsList", chfsList, "chfcList", chfcList); |
| 483 | 490 | } |
| 484 | - List<TrackDown> trackDowns = mongoTemplate.find(Query.query(Criteria.where("parentId").is(patientId).and("trackDownDateType").is(trackType).and("yn").is(1)), TrackDown.class); | |
| 491 | + | |
| 492 | + Criteria criteria = Criteria.where("parentId").is(patientId).and("yn").is(1); | |
| 493 | + | |
| 494 | + if (TrackDownDateEnums.D.getId() == trackType) { | |
| 495 | + criteria.and("trackDownDateType").in(4,8); | |
| 496 | + } else if (TrackDownDateEnums.C.getId() == trackType) { | |
| 497 | + criteria.and("trackDownDateType").in(3,9); | |
| 498 | + } else if (TrackDownDateEnums.F.getId() == trackType) { | |
| 499 | + criteria.and("trackDownDateType").in(6,11); | |
| 500 | + } else if (TrackDownDateEnums.G.getId() == trackType) { | |
| 501 | + criteria.and("trackDownDateType").in(7,10); | |
| 502 | + } else { | |
| 503 | + criteria.and("trackDownDateType").in(trackType); | |
| 504 | + } | |
| 505 | + List<TrackDown> trackDowns = mongoTemplate.find(Query.query(criteria), TrackDown.class); | |
| 506 | + | |
| 485 | 507 | for (TrackDown trackDown : trackDowns) { |
| 486 | 508 | Map<String, Object> temp = new HashMap<>(); |
| 487 | 509 | temp.put("trackDownDate", trackDown.getTrackDownDate() == null ? "--" : DateUtil.getyyyy_MM_dd_hms(trackDown.getTrackDownDate())); |
| 488 | 510 | temp.put("trackDownUser", StringUtils.isEmpty(trackDown.getTrackDownUserId()) ? "--" : trackDown.getTrackDownUserId()); |
| 511 | + if(trackDown.getTrackDownType() == TrackDownDateEnums.H.getId()){ | |
| 512 | + trackDown.setTrackDownType(4); | |
| 513 | + }else if(trackDown.getTrackDownType() == TrackDownDateEnums.I.getId()){ | |
| 514 | + trackDown.setTrackDownType(3); | |
| 515 | + }else if(trackDown.getTrackDownType() == TrackDownDateEnums.J.getId()){ | |
| 516 | + trackDown.setTrackDownType(7); | |
| 517 | + }else if(trackDown.getTrackDownType() == TrackDownDateEnums.K.getId()){ | |
| 518 | + trackDown.setTrackDownType(6); | |
| 519 | + } | |
| 520 | + | |
| 489 | 521 | temp.put("trackDownType", TrackDownTypeEnums.getName(trackDown.getTrackDownType())); |
| 490 | 522 | temp.put("result", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult()); |
| 491 | 523 | temp.put("reservatDate", trackDown.getReservatDate() == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate())); |