From 9508f9ad551ecc35214b12fdf1c51a01561e1ba0 Mon Sep 17 00:00:00 2001
From: shiyang <shiyang@lymsh.com>
Date: Wed, 11 Aug 2021 23:04:48 +0800
Subject: [PATCH] update

---
 .../com/lyms/platform/query/BabyModelQuery.java    | 22 ++++++++++++++++++++++
 .../operate/web/facade/BabyBookbuildingFacade.java |  8 +++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
index dd13cde..93bb24d 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
@@ -1251,6 +1251,17 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
         this.riskCodeExist = riskCodeExist;
     }
 
+    //隆化县， 1：高危体弱合并
+    private Integer highRiskAndWeakSon;
+
+    public Integer getHighRiskAndWeakSon() {
+        return highRiskAndWeakSon;
+    }
+
+    public void setHighRiskAndWeakSon(Integer highRiskAndWeakSon) {
+        this.highRiskAndWeakSon = highRiskAndWeakSon;
+    }
+
     @Override
     public MongoQuery convertToQuery() {
         MongoCondition condition = MongoCondition.newInstance();
@@ -1892,6 +1903,17 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
             condition.andCondition(new MongoCondition(cr));
         }
 
+        if(null != highRiskAndWeakSon){ //隆化县， 1：高危体弱合并
+            MongoCondition c1 = MongoCondition.newInstance();
+            MongoCondition con1 = MongoCondition.newInstance("highRisk", 1, MongoOper.IS);
+            MongoCondition con2 = MongoCondition.newInstance("weakSon", 1, MongoOper.IS);
+            if (c != null) {
+                c = c.andOperator(c1.orCondition(new MongoCondition[]{con1, con2}).getCriteria());
+            } else {
+                c = c1.orCondition(new MongoCondition[]{con1, con2}).getCriteria();
+            }
+        }
+
         if (null != phoneOrcardNo) {
             MongoCondition c1 = MongoCondition.newInstance();
             MongoCondition con1 = MongoCondition.newInstance("mphone", phoneOrcardNo, MongoOper.IS);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
index 788d44a..9e89884 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
@@ -3281,7 +3281,13 @@ public class BabyBookbuildingFacade {
         if (request.getHighRiskType() != null) {
             if (request.getHighRiskType() == 1) {//高危
                 // babyQuery.setLastHighRisk(1);
-                babyQuery.setHighRisk(1);
+                for (String s : babyQuery.getHospitalIdList()) {//隆化县儿童管理 1:高危页面高危与体弱合并显示
+                    if(Integer.valueOf(s)==2100001605){
+                        babyQuery.setHighRiskAndWeakSon(1);
+                    }else{
+                        babyQuery.setHighRisk(1);
+                    }
+                }
             } else if (request.getHighRiskType() == 3) {//体弱
                 babyQuery.setWeakSon(1);
             } else if (request.getHighRiskType() == 0) {
-- 
1.8.3.1