From 74ec8327db866bfd6d3027fee33751be8c35bb59 Mon Sep 17 00:00:00 2001
From: landong2015 <hanshaofeng@lymsh.com>
Date: Thu, 8 Dec 2016 15:01:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A9=9A=E6=A3=80=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=80=A7=E5=88=AB=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/platform/pojo/PremaritalCheckup.java     | 10 ++++++++++
 .../com/lyms/platform/query/PremaritalCheckupQuery.java    | 14 ++++++++++++++
 .../operate/web/facade/PremaritalCheckupFacade.java        |  7 +++++++
 .../operate/web/request/PremaritalCheckupQueryRequest.java | 10 ++++++++++
 4 files changed, 41 insertions(+)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java
index 7f002ab..e6fdff5 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java
@@ -34,6 +34,8 @@ public class PremaritalCheckup  extends BaseModel {
     private String certificateTypeId;
     //就诊卡号
     private String vcCardNo;
+    //性别类型
+    private Integer sexType;
 
     /****************** 配偶信息 ********************/
     //配偶姓名
@@ -338,6 +340,14 @@ public class PremaritalCheckup  extends BaseModel {
     //婚检医生
     private String hunJianDoctor;
 
+    public Integer getSexType() {
+        return sexType;
+    }
+
+    public void setSexType(Integer sexType) {
+        this.sexType = sexType;
+    }
+
     public String getBingGan() {
         return bingGan;
     }
diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java
index 79f2fae..16613f4 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java
@@ -45,6 +45,9 @@ public class PremaritalCheckupQuery extends BaseQuery implements IConvertToNativ
     private String hunJianDoctor;
     //医学意见
     private Integer yiXueYiJian;
+    //性别类型
+    private Integer sexType;
+
 
     @Override
     public MongoQuery convertToQuery() {
@@ -70,6 +73,9 @@ public class PremaritalCheckupQuery extends BaseQuery implements IConvertToNativ
         if (yn!=null) {
             condition = condition.and("yn", yn, MongoOper.IS);
         }
+        if (sexType!=null) {
+            condition = condition.and("sexType", sexType, MongoOper.IS);
+        }
         if (publishId!=null) {
             condition = condition.and("publishId", publishId, MongoOper.IS);
         }
@@ -105,6 +111,14 @@ public class PremaritalCheckupQuery extends BaseQuery implements IConvertToNativ
         return condition.toMongoQuery();
     }
 
+    public Integer getSexType() {
+        return sexType;
+    }
+
+    public void setSexType(Integer sexType) {
+        this.sexType = sexType;
+    }
+
     public String getId() {
         return id;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
index 1d50711..0502bbb 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
@@ -11,6 +11,7 @@ import com.lyms.platform.common.enums.YnEnums;
 import com.lyms.platform.common.result.BaseListResponse;
 import com.lyms.platform.common.result.BaseObjectResponse;
 import com.lyms.platform.common.utils.DateUtil;
+import com.lyms.platform.common.utils.SystemConfig;
 import com.lyms.platform.operate.web.request.PremaritalCheckupAddRequest;
 import com.lyms.platform.operate.web.request.PremaritalCheckupQueryRequest;
 import com.lyms.platform.operate.web.result.PremaritalCheckupHistoryResult;
@@ -188,6 +189,7 @@ public class PremaritalCheckupFacade {
         query.setYiXueYiJian(request.getYiXueYiJian());
         query.setPremaritalUpTimeStart(request.getPremaritalUpTimeStart());
         query.setPremaritalUpTimeEnd(request.getPremaritalUpTimeEnd());
+        query.setSexType(request.getSexType());
 
         if (CollectionUtils.isNotEmpty(parentIds)){
             for (String parentId : parentIds){
@@ -265,6 +267,11 @@ public class PremaritalCheckupFacade {
         String id = null;
 
         PremaritalCheckup checkup = new PremaritalCheckup();
+        if (model.getSex() != null && model.getSex()== SystemConfig.WOMAN_ID){
+            checkup.setSexType(1);
+        }else {
+            checkup.setSexType(2);
+        }
 
         /* 配偶信息 */
         if (addRequest.getDeliverStatus()!=null && addRequest.getDeliverStatus()==1){
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupQueryRequest.java
index 38f8385..c8644bf 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupQueryRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupQueryRequest.java
@@ -26,6 +26,16 @@ public class PremaritalCheckupQueryRequest extends BasePageQueryRequest{
     private Integer yiXueYiJian;
     //医院ID
     private String hospitalId;
+    //性别类型
+    private Integer sexType;
+
+    public Integer getSexType() {
+        return sexType;
+    }
+
+    public void setSexType(Integer sexType) {
+        this.sexType = sexType;
+    }
 
     public String getHospitalId() {
         return hospitalId;
-- 
1.8.3.1