From 17c29c52fa4e7936f0170c7704be14255cf97e8e Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Mon, 13 Jun 2022 14:22:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E4=BA=A7-=E7=A4=BE=E5=8C=BA=E5=8C=BB?=
 =?UTF-8?q?=E7=94=9F=E7=BB=9F=E8=AE=A1=EF=BC=8C=E9=87=8D=E5=A4=8D=E6=A1=A3?=
 =?UTF-8?q?=E6=A1=88=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/BookbuildingFacade.java     |  5 +++++
 .../operate/web/request/RecommendQuery.java        | 22 ++++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
index a9abcb6..00d1d08 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
@@ -3444,6 +3444,8 @@ public class BookbuildingFacade {
         if(StringUtils.isNotEmpty(hospitalId)){
             recommendQuery.setYyzyfmHospitalId(hospitalId);
         }
+        //是否隐藏 更改为：0，转诊建档，待接收 1，转诊建档，已接收 2，隐藏建档，在A院建档去B医院做产检
+        recommendQuery.setExtEnable(false);
         MongoQuery query = recommendQuery.convertToQuery().addOrder(Sort.Direction.DESC, "bookbuildingDate");
         AggregationOperation queryParam = Aggregation.match(query.getCriteria());
         AggregationOperation group = Aggregation.group("townOrgId","recommend");
@@ -3478,7 +3480,10 @@ public class BookbuildingFacade {
         if(StringUtils.isNotEmpty(hospitalId)){
             recommendQuery.setYyzyfmHospitalId(hospitalId);
         }
+        //是否隐藏 更改为：0，转诊建档，待接收 1，转诊建档，已接收 2，隐藏建档，在A院建档去B医院做产检
+        recommendQuery.setExtEnable(false);
         MongoQuery query = recommendQuery.convertToQuery();
+        query.convertToMongoQuery().toString();
         //分页后总数量
         recommendQuery.mysqlBuild((int)mongoTemplate.count(query.convertToMongoQuery(),Patients.class));
         //分页
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RecommendQuery.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RecommendQuery.java
index 83320d1..a970dd7 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RecommendQuery.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RecommendQuery.java
@@ -9,7 +9,9 @@ import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.common.utils.StringUtils;
 import org.springframework.data.mongodb.core.query.Criteria;
 
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  *
@@ -43,6 +45,16 @@ public class RecommendQuery extends BaseQuery implements IConvertToNativeQuery {
      */
     private String yyzyfmHospitalId;
 
+    //是否隐藏 更改为：0，转诊建档，待接收 1，转诊建档，已接收 2，隐藏建档，在A院建档去B医院做产检
+    private Boolean extEnable;
+
+    public Boolean getExtEnable() {
+        return extEnable;
+    }
+
+    public void setExtEnable(Boolean extEnable) {
+        this.extEnable = extEnable;
+    }
 
     public String getYyzyfmHospitalId() {
         return yyzyfmHospitalId;
@@ -96,6 +108,16 @@ public class RecommendQuery extends BaseQuery implements IConvertToNativeQuery {
         if (StringUtils.isNotEmpty(yyzyfmHospitalId)) {
             condition = condition.and("yyzyfmHospitalId", yyzyfmHospitalId, MongoOper.IS);
         }
+        //enable ：
+        // 0，转诊建档，待接收
+        // 1，转诊建档，已接收
+        // 2，隐藏建档，在A院建档去B医院做产检-----建档管理里面不展示
+        if (null != extEnable) {
+            List list = new ArrayList();
+            list.add("1");
+            list.add("2");
+            condition = condition.and("enable", list, MongoOper.NIN);
+        }
         Criteria c = null;
 
         c = Criteria.where("recommend").ne(null);
-- 
1.8.3.1