From df226aef205f660925f89aa9ef4bdb13a783d46e Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Wed, 19 May 2021 17:42:49 +0800
Subject: [PATCH] update

---
 .../operate/web/facade/MatDeliverFacade.java       | 74 +++++++++++-----------
 1 file changed, 38 insertions(+), 36 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
index 101f3f0..e8132e0 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
@@ -2698,45 +2698,10 @@ public class MatDeliverFacade {
         }
         /**********增加完毕***********/
 
-        //产后复查状态评估查询
+
         if (childbirthManagerRequest.getType() != null && childbirthManagerRequest.getStatus() != null)
         {
-            int days = 0;
-            switch (childbirthManagerRequest.getStatus())
-            {
-                case 1:
-                    days = 3;
-                    break;
-                case 2:
-                    days = 7;
-                    break;
-                case 3:
-                    days = 14;
-                    break;
-                case 4:
-                    days = 28;
-                    break;
-                case 5:
-                    days = 42;
-                    break;
-            }
 
-            Date date = DateUtil.addDay(new Date(),-days);
-            //1 应评估 2 已评估
-            List<Integer> status = new ArrayList<>();
-            status.add(childbirthManagerRequest.getStatus());
-            if (childbirthManagerRequest.getType() == 1)
-            {
-                matDeliverQuery.setStatus(status);
-                matDeliverQuery.setIsStatus(false);
-                matDeliverQuery.setEndStart(date);
-                matDeliverQuery.setNeEnd(true);
-            }
-            else
-            {
-                matDeliverQuery.setStatus(status);
-                matDeliverQuery.setIsStatus(true);
-            }
         }
 
         List <MaternalDeliverModel> maternalDeliverModelList;
@@ -2775,6 +2740,43 @@ public class MatDeliverFacade {
                         // 什么都不做，这里是数据传入错误了
                     }
                 }
+                //产后复查状态评估查询
+                int days = 0;
+                switch (childbirthManagerRequest.getStatus())
+                {
+                    case 1:
+                        days = 3;
+                        break;
+                    case 2:
+                        days = 7;
+                        break;
+                    case 3:
+                        days = 14;
+                        break;
+                    case 4:
+                        days = 28;
+                        break;
+                    case 5:
+                        days = 42;
+                        break;
+                }
+
+                Date date = DateUtil.addDay(new Date(),-days);
+                //1 应评估 2 已评估
+                List<Integer> status = new ArrayList<>();
+                status.add(childbirthManagerRequest.getStatus());
+                if (childbirthManagerRequest.getType() == 1)
+                {
+                    matDeliverQuery.setStatus(status);
+                    matDeliverQuery.setIsStatus(false);
+                    matDeliverQuery.setEndStart(date);
+                    matDeliverQuery.setNeEnd(true);
+                }
+                else
+                {
+                    matDeliverQuery.setStatus(status);
+                    matDeliverQuery.setIsStatus(true);
+                }
 
                 matDeliverQuery.setFmHospital(hid);
                 matDeliverQuery.setLimit(childbirthManagerRequest.getLimit());
-- 
1.8.3.1