Commit df226aef205f660925f89aa9ef4bdb13a783d46e
1 parent
44a9bc03e4
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 38 additions and 36 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
df226ae
| ... | ... | @@ -2698,45 +2698,10 @@ |
| 2698 | 2698 | } |
| 2699 | 2699 | /**********增加完毕***********/ |
| 2700 | 2700 | |
| 2701 | - //产后复查状态评估查询 | |
| 2701 | + | |
| 2702 | 2702 | if (childbirthManagerRequest.getType() != null && childbirthManagerRequest.getStatus() != null) |
| 2703 | 2703 | { |
| 2704 | - int days = 0; | |
| 2705 | - switch (childbirthManagerRequest.getStatus()) | |
| 2706 | - { | |
| 2707 | - case 1: | |
| 2708 | - days = 3; | |
| 2709 | - break; | |
| 2710 | - case 2: | |
| 2711 | - days = 7; | |
| 2712 | - break; | |
| 2713 | - case 3: | |
| 2714 | - days = 14; | |
| 2715 | - break; | |
| 2716 | - case 4: | |
| 2717 | - days = 28; | |
| 2718 | - break; | |
| 2719 | - case 5: | |
| 2720 | - days = 42; | |
| 2721 | - break; | |
| 2722 | - } | |
| 2723 | 2704 | |
| 2724 | - Date date = DateUtil.addDay(new Date(),-days); | |
| 2725 | - //1 应评估 2 已评估 | |
| 2726 | - List<Integer> status = new ArrayList<>(); | |
| 2727 | - status.add(childbirthManagerRequest.getStatus()); | |
| 2728 | - if (childbirthManagerRequest.getType() == 1) | |
| 2729 | - { | |
| 2730 | - matDeliverQuery.setStatus(status); | |
| 2731 | - matDeliverQuery.setIsStatus(false); | |
| 2732 | - matDeliverQuery.setEndStart(date); | |
| 2733 | - matDeliverQuery.setNeEnd(true); | |
| 2734 | - } | |
| 2735 | - else | |
| 2736 | - { | |
| 2737 | - matDeliverQuery.setStatus(status); | |
| 2738 | - matDeliverQuery.setIsStatus(true); | |
| 2739 | - } | |
| 2740 | 2705 | } |
| 2741 | 2706 | |
| 2742 | 2707 | List <MaternalDeliverModel> maternalDeliverModelList; |
| ... | ... | @@ -2774,6 +2739,43 @@ |
| 2774 | 2739 | } catch (Exception e) { |
| 2775 | 2740 | // 什么都不做，这里是数据传入错误了 |
| 2776 | 2741 | } |
| 2742 | + } | |
| 2743 | + //产后复查状态评估查询 | |
| 2744 | + int days = 0; | |
| 2745 | + switch (childbirthManagerRequest.getStatus()) | |
| 2746 | + { | |
| 2747 | + case 1: | |
| 2748 | + days = 3; | |
| 2749 | + break; | |
| 2750 | + case 2: | |
| 2751 | + days = 7; | |
| 2752 | + break; | |
| 2753 | + case 3: | |
| 2754 | + days = 14; | |
| 2755 | + break; | |
| 2756 | + case 4: | |
| 2757 | + days = 28; | |
| 2758 | + break; | |
| 2759 | + case 5: | |
| 2760 | + days = 42; | |
| 2761 | + break; | |
| 2762 | + } | |
| 2763 | + | |
| 2764 | + Date date = DateUtil.addDay(new Date(),-days); | |
| 2765 | + //1 应评估 2 已评估 | |
| 2766 | + List<Integer> status = new ArrayList<>(); | |
| 2767 | + status.add(childbirthManagerRequest.getStatus()); | |
| 2768 | + if (childbirthManagerRequest.getType() == 1) | |
| 2769 | + { | |
| 2770 | + matDeliverQuery.setStatus(status); | |
| 2771 | + matDeliverQuery.setIsStatus(false); | |
| 2772 | + matDeliverQuery.setEndStart(date); | |
| 2773 | + matDeliverQuery.setNeEnd(true); | |
| 2774 | + } | |
| 2775 | + else | |
| 2776 | + { | |
| 2777 | + matDeliverQuery.setStatus(status); | |
| 2778 | + matDeliverQuery.setIsStatus(true); | |
| 2777 | 2779 | } |
| 2778 | 2780 | |
| 2779 | 2781 | matDeliverQuery.setFmHospital(hid); |