From 2e23790de7d9580957920c0cfab1820ebcbec438 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Mon, 25 Dec 2017 16:34:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8C=87=E5=AF=BC=E6=84=8F?=
 =?UTF-8?q?=E8=A7=81=E6=8C=89=E8=83=8E=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/lyms/platform/pojo/Guidelines.java  | 12 ++++++++++++
 .../java/com/lyms/platform/query/GuidelinesQuery.java     | 15 +++++++++++++++
 .../operate/web/controller/GuideLineController.java       |  2 ++
 .../com/lyms/platform/operate/web/request/GuideQuery.java | 14 ++++++++++++++
 4 files changed, 43 insertions(+)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Guidelines.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Guidelines.java
index d84b675..0a188f4 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/Guidelines.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Guidelines.java
@@ -25,11 +25,23 @@ public class Guidelines extends BaseModel {
     /* 孕期：周；产后：天；儿童：月 */
     private Integer start;
     private Integer end;
+    /**
+     * 胎数 双胎以上按双胎处理
+     */
+    private Integer number;
 
     private String category;
     private String content;
     private Integer yn;
 
+    public Integer getNumber() {
+        return number;
+    }
+
+    public void setNumber(Integer number) {
+        this.number = number;
+    }
+
     public String getDeliveryType() {
         return deliveryType;
     }
diff --git a/platform-dal/src/main/java/com/lyms/platform/query/GuidelinesQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/GuidelinesQuery.java
index a2fb368..055d754 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/GuidelinesQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/GuidelinesQuery.java
@@ -36,9 +36,24 @@ public class GuidelinesQuery extends BaseQuery implements IConvertToNativeQuery
         if (null != minEnd) {
             condition = condition.and("end", minEnd, MongoOper.GTE);
         }
+        if (null != number) {
+            condition = condition.and("number", number, MongoOper.IS);
+        }else{
+            condition = condition.and("number", false, MongoOper.EXISTS);
+        }
         return condition.toMongoQuery();
     }
 
+    public Integer getNumber() {
+        return number;
+    }
+
+    public void setNumber(Integer number) {
+        this.number = number;
+    }
+
+    private Integer number;
+
     private String id;
     /* 1:孕期,2:产后,3:儿童 */
     private Integer type;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/GuideLineController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/GuideLineController.java
index b943523..6678d9e 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/GuideLineController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/GuideLineController.java
@@ -32,6 +32,8 @@ public class GuideLineController extends BaseController {
         guidelinesQuery.setType(guideQuery.getType());
         guidelinesQuery.setMaxStart(guideQuery.getNum());
         guidelinesQuery.setMinEnd(guideQuery.getNum());
+        guidelinesQuery.setNumber(guideQuery.getTnum());
+
         List<Guidelines> list = guidelinesService.queryGuidelines(guidelinesQuery);
         StringBuilder stringBuilder=new StringBuilder(128);
         if(CollectionUtils.isNotEmpty(list)){
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/GuideQuery.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/GuideQuery.java
index fbf4ae8..7e99c5b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/GuideQuery.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/GuideQuery.java
@@ -6,6 +6,20 @@ package com.lyms.platform.operate.web.request;
 public class GuideQuery {
     private Integer type;
     private Integer num;
+    //胎数
+    private Integer tnum;
+
+    public Integer getTnum() {
+        //多胎的时候按双胎处理
+        if(tnum!=null &&tnum>2){
+            return 2;
+        }
+        return tnum;
+    }
+
+    public void setTnum(Integer tnum) {
+        this.tnum = tnum;
+    }
 
     public Integer getNum() {
         return num;
-- 
1.8.3.1