From d62183488be7f3e07aeec408457d62d5f92bc5cc Mon Sep 17 00:00:00 2001
From: wtt <wtt@qq.com>
Date: Wed, 9 Sep 2020 15:46:22 +0800
Subject: [PATCH] update

---
 .../platform/query/BabyKindergartenCheckQuery.java | 29 ++++++++++++++++++++++
 .../web/facade/BabyKindergartenCheckFacade.java    | 10 ++++----
 .../web/request/BabyKindergartenCheckRequest.java  |  3 +--
 3 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyKindergartenCheckQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyKindergartenCheckQuery.java
index cf07b1e..f11d2cd 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/BabyKindergartenCheckQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyKindergartenCheckQuery.java
@@ -44,11 +44,34 @@ public class BabyKindergartenCheckQuery extends BaseQuery implements IConvertToN
     // 直接 定期体检only=1。首次体检后台默认1 ，定期体检默认0
     private String only;
 
+    //身高评价 上(范围值)
+    private String heightAssess;
+    //体重评价
+    private String weightAssess;
+
+
     private String sort;
 
+
     //电话
     private String phon;
 
+    public String getHeightAssess() {
+        return heightAssess;
+    }
+
+    public void setHeightAssess(String heightAssess) {
+        this.heightAssess = heightAssess;
+    }
+
+    public String getWeightAssess() {
+        return weightAssess;
+    }
+
+    public void setWeightAssess(String weightAssess) {
+        this.weightAssess = weightAssess;
+    }
+
     public String getPhon() {
         return phon;
     }
@@ -198,6 +221,12 @@ public class BabyKindergartenCheckQuery extends BaseQuery implements IConvertToN
         if (StringUtils.isNotEmpty(bjId)) {
             condition = condition.and("bjId", bjId, MongoOper.IS);
         }
+        if (StringUtils.isNotEmpty(heightAssess)) {
+            condition = condition.and("heightAssess", heightAssess, MongoOper.IS);
+        }
+        if (StringUtils.isNotEmpty(weightAssess)) {
+            condition = condition.and("weightAssess", weightAssess, MongoOper.IS);
+        }
         //检查医生
         if (StringUtils.isNotEmpty(checkDoctor)) {
             condition = condition.and("checkDoctor", checkDoctor, MongoOper.IS);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyKindergartenCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyKindergartenCheckFacade.java
index 5abe070..91f19fa 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyKindergartenCheckFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyKindergartenCheckFacade.java
@@ -498,15 +498,15 @@ public class BabyKindergartenCheckFacade extends BaseServiceImpl {
                         if (model.getPthreeDs() < value) {
                             res = "P97 >";
                         } else if (model.getPthreeDs() >= value && value > model.getPtwoDs()) {
-                            res = "P90~97";
+                            res = "P90-P97";
                         } else if (model.getPtwoDs() >= value && value > model.getPoneDs()) {
-                            res = "P75~90";
+                            res = "P75-P90";
                         } else if (model.getPoneDs() >= value && value >= model.getRoneDs()) {
-                            res = "P25~75";
+                            res = "P25-P75";
                         } else if (model.getRoneDs() > value && value >= model.getRtwoDs()) {
-                            res = "P10~25";
+                            res = "P10-P25";
                         } else if (model.getRtwoDs() > value && value >= model.getRthreeDs()) {
-                            res = "P3~10";
+                            res = "P3-P10";
                         } else if (model.getRthreeDs() > value) {
                             res = "P3 <";
                         }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyKindergartenCheckRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyKindergartenCheckRequest.java
index dec0096..e1f561e 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyKindergartenCheckRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyKindergartenCheckRequest.java
@@ -61,8 +61,7 @@ public class BabyKindergartenCheckRequest {
     private String bjId;
     private Map bjIdMap;//不传
 
-    // 既往史 "yeaOrNo", "yes" "no"  ,
-    // 内容 content ：xtxxz:true 先天性心脏病，dx:true  癫痫，gr:true 高热，xc:true 哮喘，qt:true 其它 qtc: 其它内容
+    // 既往史 "yeaOrNo", "yes" "no"  , xtxxz:true 先天性心脏病，dx:true  癫痫，gr:true 高热，xc:true 哮喘，qt:true 其它 qtc: 其它内容
     private Map pastHistory;
     //传染病史
     private Map infectDiseases;
-- 
1.8.3.1