From 1a066618aef1f20fc3cd650f4d6ff06d0c46e129 Mon Sep 17 00:00:00 2001
From: wtt <wtt@qq.com>
Date: Wed, 16 Dec 2020 18:30:52 +0800
Subject: [PATCH] update

---
 .../web/controller/BabyBuildController.java        | 15 +++++++++++
 .../operate/web/facade/BabyBookbuildingFacade.java | 31 ++++++++++++++++++++++
 .../web/facade/PremaritalCheckupFacade.java        |  2 ++
 .../web/result/PremaritalCheckupPageResult.java    | 21 ++++++++++++++-
 4 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java
index 6fe04b2..0d24236 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java
@@ -324,6 +324,21 @@ public class BabyBuildController extends BaseController {
     }
 
     /**
+     * 查询符合条件的儿童
+     * 判断是否已有儿童中
+     *  母亲手机号、儿童出生日期、性别，满足这三项重复提示：
+     * @return
+     */
+    @RequestMapping(value = "/queryBabyListDate", method = RequestMethod.GET)
+    @ResponseBody
+    @TokenRequired
+    public BaseListResponse queryBabyListDate( @RequestParam(value = "mphone", required = true) String mphone,
+                                          @RequestParam(value = "birth", required = true) String birth,
+                                          @RequestParam(value = "sex", required = true) Integer sex  ) {
+        return babyBookbuildingFacade.queryBabyListDate(mphone,birth,sex);
+    }
+
+    /**
      * 修改儿童档案结案状态
      * @param babyManageRequest
      * @param httpServletRequest
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 be4aad3..ad2d728 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
@@ -3179,6 +3179,37 @@ public class BabyBookbuildingFacade {
     }
 
     /**
+     *查询符合条件的儿童
+     * 判断是否已有儿童中
+     *  母亲手机号、儿童出生日期、性别，满足这三项重复提示：
+     * @Author: 武涛涛
+     * @Date: 2020/12/16 17:23
+     */
+    public BaseListResponse queryBabyListDate(String mphone,String birth,Integer sex ) {
+        BaseListResponse br = new BaseListResponse();
+
+        BabyModelQuery babyQuery = new BabyModelQuery();
+        List buildType = new ArrayList();
+        buildType.add(1);//儿童直接建档
+        buildType.add(2);//产妇分娩建档
+        babyQuery.setBuildTypeList(buildType);
+        babyQuery.setDataStatus(true);//排除自动建档数据
+        babyQuery.setYn(YnEnums.YES.getId());
+
+        babyQuery.setMphone(mphone);
+        if(StringUtils.isNotEmpty(birth)){
+            babyQuery.setBirthStart(DateUtil.parseYMD(birth));
+            babyQuery.setBirthEnd(new Date(DateUtil.parseYMD(birth).getTime() + 24 * 60 * 60 * 1000 - 1));
+        }
+        babyQuery.setSex(sex);
+        List <BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "created", Sort.Direction.DESC);
+        br.setData(models);
+        br.setErrorcode(ErrorCodeConstants.SUCCESS);
+        br.setErrormsg("成功");
+        return br;
+    }
+
+    /**
      * 生成儿童指导短信
      *
      * @param request
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 6d0c91e..a075495 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
@@ -1710,6 +1710,8 @@ public class PremaritalCheckupFacade {
                 archiveModel.getAreaId(), archiveModel.getStreetId(), archiveModel.getAddress(), basicConfigService);
         checkupResult.setLiveAddress(liveAddress);
         checkupResult.setPhone(archiveModel.getPhone());
+        checkupResult.setJczt(result.getJczt());
+        checkupResult.setFkjjState(result.getFkjjState());
 
         checkupResult.setSpouseName(result.getSpouseName());
         checkupResult.setSpouseCertificateType(getBaseicConfigByid(result.getSpouseCertificateTypeId()));
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java
index 56cbb69..5f5cb20 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java
@@ -45,7 +45,10 @@ public class PremaritalCheckupPageResult {
     //联系方式
     private String phone;
 
-
+    // 1妇科检查，男性检查拒绝，2不拒绝
+    private  String jczt;
+    //加上绝经 1否 2 是
+    private  String fkjjState;
     /****配偶信息 ***/
     //配偶姓名
     private String spouseName;
@@ -473,6 +476,22 @@ public class PremaritalCheckupPageResult {
         this.gaoWanZuo = gaoWanZuo;
     }
 
+    public String getJczt() {
+        return jczt;
+    }
+
+    public void setJczt(String jczt) {
+        this.jczt = jczt;
+    }
+
+    public String getFkjjState() {
+        return fkjjState;
+    }
+
+    public void setFkjjState(String fkjjState) {
+        this.fkjjState = fkjjState;
+    }
+
     public String getGaoWanYou() {
         return gaoWanYou;
     }
-- 
1.8.3.1