From 9157097f6fd6e6eb402571bace66dfe58443b145 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Thu, 13 Jul 2017 16:23:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=8F=E8=AE=BF=E5=88=97=E8=A1=A8=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/controller/BabyCheckController.java   | 11 +++++++++++
 .../operate/web/controller/FollowUpController.java    |  1 +
 .../platform/operate/web/facade/BabyCheckFacade.java  | 19 +++++++++++++++++++
 .../platform/operate/web/result/BabyBasicResult.java  |  9 +++++++++
 4 files changed, 40 insertions(+)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java
index d1d3a49..8e08aff 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java
@@ -85,6 +85,17 @@ public class BabyCheckController extends BaseController{
     }
 
     /**
+     * 查询儿保检查记录
+     * @param id
+     * @return
+     */
+    @RequestMapping(value = "/queryBabyBaseInfo/{id}", method = RequestMethod.GET)
+    @ResponseBody
+    public BaseObjectResponse queryBabyBaseInfo(@PathVariable("id")String id){
+        return  babyCheckFacade.queryBabyBaseInfo(id);
+    }
+
+    /**
      * 查询儿保检查详情
      * @param id
      * @return
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java
index b995298..74570ab 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java
@@ -71,6 +71,7 @@ public class FollowUpController extends BaseController {
 
         BabyPatientExtendEarFollowUpQuery query = new BabyPatientExtendEarFollowUpQuery();
         query.setBabyId(babyId);
+        query.setSort("follow_time");
         //获取当前登录用户ID
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
         if (loginState == null) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
index 935b106..8ceae2b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
@@ -470,6 +470,25 @@ public class BabyCheckFacade {
         return br;
     }
 
+    /**
+     * 查询儿保检查记录
+     *
+     * @param id 建档id
+     * @return
+     */
+    public BaseObjectResponse queryBabyBaseInfo(String id) {
+        BaseObjectResponse br = new BaseObjectResponse();
+        BabyBasicResult base = new BabyBasicResult();
+        Map<String, Object> resMap = new HashMap<>();
+        getBabyModel(id, base);
+        resMap.put("baseInfo", base);
+        br.setData(resMap);
+        br.setErrorcode(ErrorCodeConstants.SUCCESS);
+        br.setErrormsg("成功");
+        return br;
+    }
+
+
     public void getBabyCheckList(String[] ids, PersonModel personModel, List<Map<String, String>> list) {
         List<BabyCheckModel> checkModels;
         if (personModel != null) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java
index 493c829..6941f14 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java
@@ -34,9 +34,18 @@ public class BabyBasicResult {
     private String vcCardNo;
     //母亲身份证号
     private String cardNo;
+    //证件类型
+    private String pregnantCertificateTypeId;
     //是否高危儿童 0 非高危 1高危
     private Integer babyLastHighRisk;
 
+    public String getPregnantCertificateTypeId() {
+        return pregnantCertificateTypeId;
+    }
+
+    public void setPregnantCertificateTypeId(String pregnantCertificateTypeId) {
+        this.pregnantCertificateTypeId = pregnantCertificateTypeId;
+    }
 
     public String getSourceId()
     {
-- 
1.8.3.1