Commit dcc6b9a8090777b6cd3fe9387ecbf0bc07bf0d50
1 parent
344779c63f
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 72 additions and 0 deletions
platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java
View file @
dcc6b9a
| ... | ... | @@ -48,7 +48,28 @@ |
| 48 | 48 | |
| 49 | 49 | private List<String> pids; |
| 50 | 50 | |
| 51 | + //产后复查评估 状态 1 出院前评估 2 产后7天评估 3 产后14天评估 4 产后28天评估 5 产后42天评估 | |
| 51 | 52 | |
| 53 | + private List<Integer> status; | |
| 54 | + private Boolean isStatus; | |
| 55 | + | |
| 56 | + public Boolean getIsStatus() { | |
| 57 | + return isStatus; | |
| 58 | + } | |
| 59 | + | |
| 60 | + public void setIsStatus(Boolean isStatus) { | |
| 61 | + this.isStatus = isStatus; | |
| 62 | + } | |
| 63 | + | |
| 64 | + public List<Integer> getStatus() { | |
| 65 | + return status; | |
| 66 | + } | |
| 67 | + | |
| 68 | + public void setStatus(List<Integer> status) { | |
| 69 | + this.status = status; | |
| 70 | + } | |
| 71 | + | |
| 72 | + | |
| 52 | 73 | public List<String> getPids() { |
| 53 | 74 | return pids; |
| 54 | 75 | } |
| ... | ... | @@ -382,6 +403,16 @@ |
| 382 | 403 | |
| 383 | 404 | if (null != pregnancyOut) { |
| 384 | 405 | condition = condition.and("baby.pregnancyOut", pregnancyOut, MongoOper.IS); |
| 406 | + } | |
| 407 | + if (CollectionUtils.isNotEmpty(status)) { | |
| 408 | + if (isStatus) | |
| 409 | + { | |
| 410 | + condition = condition.and("status", status, MongoOper.IN); | |
| 411 | + } | |
| 412 | + else | |
| 413 | + { | |
| 414 | + condition = condition.and("status", status, MongoOper.NIN); | |
| 415 | + } | |
| 385 | 416 | } |
| 386 | 417 | |
| 387 | 418 | if (null != deformity) { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
dcc6b9a
| ... | ... | @@ -2702,6 +2702,47 @@ |
| 2702 | 2702 | } |
| 2703 | 2703 | /**********增加完毕***********/ |
| 2704 | 2704 | |
| 2705 | + //产后复查状态评估查询 | |
| 2706 | + if (childbirthManagerRequest.getType() != null && childbirthManagerRequest.getStatus() != null) | |
| 2707 | + { | |
| 2708 | + int days = 0; | |
| 2709 | + switch (childbirthManagerRequest.getStatus()) | |
| 2710 | + { | |
| 2711 | + case 1: | |
| 2712 | + days = 3; | |
| 2713 | + break; | |
| 2714 | + case 2: | |
| 2715 | + days = 7; | |
| 2716 | + break; | |
| 2717 | + case 3: | |
| 2718 | + days = 14; | |
| 2719 | + break; | |
| 2720 | + case 4: | |
| 2721 | + days = 28; | |
| 2722 | + break; | |
| 2723 | + case 5: | |
| 2724 | + days = 42; | |
| 2725 | + break; | |
| 2726 | + } | |
| 2727 | + | |
| 2728 | + Date date = DateUtil.addDay(new Date(),-days); | |
| 2729 | + //1 应评估 2 已评估 | |
| 2730 | + List<Integer> status = new ArrayList<>(); | |
| 2731 | + status.add(childbirthManagerRequest.getStatus()); | |
| 2732 | + if (childbirthManagerRequest.getType() == 1) | |
| 2733 | + { | |
| 2734 | + matDeliverQuery.setStatus(status); | |
| 2735 | + matDeliverQuery.setIsStatus(false); | |
| 2736 | + matDeliverQuery.setEndStart(date); | |
| 2737 | + matDeliverQuery.setNeEnd(true); | |
| 2738 | + } | |
| 2739 | + else | |
| 2740 | + { | |
| 2741 | + matDeliverQuery.setStatus(status); | |
| 2742 | + matDeliverQuery.setIsStatus(true); | |
| 2743 | + } | |
| 2744 | + } | |
| 2745 | + | |
| 2705 | 2746 | List <MaternalDeliverModel> maternalDeliverModelList; |
| 2706 | 2747 | if (!childbirthManagerRequest.isExcel() && (childbirthManagerRequest.getHloseBloodType() != null |
| 2707 | 2748 | || StringUtils.isNotEmpty(childbirthManagerRequest.getDeliveryMode()) || childbirthManagerRequest.getWeight() != null) |