From 7d18ba847640901310849515557ed3b4a046b7ec Mon Sep 17 00:00:00 2001
From: wtt <wtt@qq.com>
Date: Wed, 10 Jun 2020 17:00:19 +0800
Subject: [PATCH] update

---
 .../java/com/lyms/platform/query/SieveQuery.java   | 12 ++++++++
 .../operate/web/controller/SieveController.java    |  5 ++--
 .../platform/operate/web/facade/SieveFacade.java   | 35 ++++++++++++++++++++++
 3 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java
index a190e4f..ac126cc 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java
@@ -95,6 +95,8 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery {
 
     private List<String> parentIds;
 
+    private List<String> lymsSieveIds;
+
     private List<Integer> statuses;
 
     /**
@@ -118,6 +120,13 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery {
     private String areaId;
     private String streetId;
 
+    public List<String> getLymsSieveIds() {
+        return lymsSieveIds;
+    }
+
+    public void setLymsSieveIds(List<String> lymsSieveIds) {
+        this.lymsSieveIds = lymsSieveIds;
+    }
 
     public String getProvinceId() {
         return provinceId;
@@ -420,6 +429,9 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery {
         if (null != parentIds && parentIds.size() > 0) {
             condition = condition.and("parentId", parentIds, MongoOper.IN);
         }
+        if (null != lymsSieveIds && lymsSieveIds.size() > 0) {
+            condition = condition.and("id", lymsSieveIds, MongoOper.IN);
+        }
 
         if (StringUtils.isNotEmpty(name)) {
             condition = condition.and("name", name, MongoOper.LIKE);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java
index 415ef14..1444625 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java
@@ -127,12 +127,11 @@ public class SieveController extends BaseController {
     @ResponseBody
     @RequestMapping(value = "/reviceSieve", method = RequestMethod.POST)
     @TokenRequired
-    public BaseResponse reviceSieve(@RequestBody List<String> parentIds, HttpServletRequest request) {
+   public BaseResponse reviceSieve(@RequestBody List<String> parentIds, HttpServletRequest request) {
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
-        return sieveFacade.reviceSieve(parentIds, loginState.getId());
+        return sieveFacade.reviceSieve2(parentIds, loginState.getId());
     }
 
-
     /**
      * 产前诊断
      *
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
index 9fea7d0..dce0444 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
@@ -1266,6 +1266,41 @@ public class SieveFacade {
         }
         return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
     }
+    /**
+     * 功能描述: 接收产筛申请,入参是档案id就使用以前方式
+     * @author 武涛涛
+     * @date 2020/6/10
+     */
+    public BaseResponse reviceSieve2(List<String> parentIds, Integer userId) {
+        if (CollectionUtils.isNotEmpty(parentIds)) {
+            SieveQuery query = new SieveQuery();
+            query.setLymsSieveIds(parentIds);
+            query.setYn(YnEnums.YES.getId());
+            List<SieveModel> list = sieveService.queryList(query);
+
+            if (CollectionUtils.isNotEmpty(list)) {
+                for (SieveModel sieve : list) {
+                    sieve.setReviceStatus(2);
+                    sieveService.updateOneChanQianDiaSieve(sieve);
+                }
+            }
+        }
+
+        if (CollectionUtils.isNotEmpty(parentIds)) {
+            SieveQuery query = new SieveQuery();
+            query.setParentIds(parentIds);
+            query.setYn(YnEnums.YES.getId());
+            List<SieveModel> list = sieveService.queryList(query);
+
+            if (CollectionUtils.isNotEmpty(list)) {
+                for (SieveModel sieve : list) {
+                    sieve.setReviceStatus(2);
+                    sieveService.updateOneChanQianDiaSieve(sieve);
+                }
+            }
+        }
+        return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
+    }
 
     public BaseResponse queryCqsievesReport(CqSieveQueryRequest cqSieveQueryRequest, Integer userId) {
         //获取用户权限医院和筛选条件的交集
-- 
1.8.3.1