From bccf8215aa898f91f4cce173fdcf175ecfaea122 Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Wed, 20 Oct 2021 09:41:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=A6=E7=9A=87=E5=B2=9B-=E9=AB=98=E5=8D=B1?=
 =?UTF-8?q?=E5=84=BF=E4=B8=93=E7=A7=91-=E6=A1=A3=E6=A1=88=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2bug=E6=94=B9=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/platform/query/BabyHighRiskBabyModelQuery.java     | 5 +----
 .../com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyHighRiskBabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyHighRiskBabyModelQuery.java
index e375e40..ad37efa 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/BabyHighRiskBabyModelQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyHighRiskBabyModelQuery.java
@@ -504,10 +504,7 @@ public class BabyHighRiskBabyModelQuery extends BaseQuery implements IConvertToN
                 MongoCondition con2 = MongoCondition.newInstance("cyzdList.cyzd", cyzd, MongoOper.IN);
                 cor=con.orCondition(new MongoCondition[]{con1, con2}).getCriteria();
             }else {
-                MongoCondition con = MongoCondition.newInstance();
-                MongoCondition con1 = MongoCondition.newInstance("cyzd", cyzd, MongoOper.NIN);
-                MongoCondition con2 = MongoCondition.newInstance("cyzdList.cyzd", cyzd, MongoOper.NIN);
-                cor=con.orCondition(new MongoCondition[]{con1, con2}).getCriteria();
+                condition = condition.and("cyzd",cyzd,MongoOper.NIN).and("cyzdList.cyzd",cyzd,MongoOper.NIN);
             }
         }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java
index 904a808..1fc66ab 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java
@@ -731,7 +731,7 @@ public class BabyHighRiskBabyFacade extends BaseServiceImpl {
             if(null!=babyQuery.getClassify()){
                 babyQuery.setCzOrfzProject("cz");
                 List<Object> list = new ArrayList<>();
-                List<QhdDischargedDiagnose> list2=mongoTemplate.findAll(QhdDischargedDiagnose.class);
+                List<QhdDischargedDiagnose> list2=mongoTemplate.find(new Query().addCriteria(Criteria.where("yn").is(1)),QhdDischargedDiagnose.class);
                 //Pattern封装正则模糊查询表达式 查所有自定义出院诊断类型数据
                 for (QhdDischargedDiagnose dischargedDiagnose : list2) {
                     list.add(Pattern.compile("^.*"+dischargedDiagnose.getDiagnoseName()+".*$"));
-- 
1.8.3.1