From f20d89194c6f2437dd1111bd8fdc8fff8ebdaf16 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Wed, 12 Jul 2017 17:31:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=A3=80=E5=8C=BB=E7=94=9F=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/master/BabyPatientExtendEarFollowUpMapper.java       |  2 ++
 .../service/BabyPatientExtendEarFollowUpService.java         |  1 +
 .../impl/BabyPatientExtendEarFollowUpServiceImpl.java        |  5 +++++
 .../mainOrm/master/BabyPatientExtendEarFollowUp.xml          | 12 ++++++++++++
 .../platform/operate/web/controller/FollowUpController.java  |  8 ++++++--
 5 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyPatientExtendEarFollowUpMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyPatientExtendEarFollowUpMapper.java
index dc5699a..4e41871 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyPatientExtendEarFollowUpMapper.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyPatientExtendEarFollowUpMapper.java
@@ -18,4 +18,6 @@ public interface BabyPatientExtendEarFollowUpMapper {
 
     public List<BabyPatientExtendEarFollowUp> queryBabyPatientExtendEarFollowUp(BabyPatientExtendEarFollowUpQuery query);
 
+    public List<BabyPatientExtendEarFollowUp> queryBabyPatientExtendEarFollowUpByBaby(BabyPatientExtendEarFollowUpQuery query);
+
 }
\ No newline at end of file
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyPatientExtendEarFollowUpService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyPatientExtendEarFollowUpService.java
index d5e394a..d48a455 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyPatientExtendEarFollowUpService.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyPatientExtendEarFollowUpService.java
@@ -17,5 +17,6 @@ public interface BabyPatientExtendEarFollowUpService {
     public int queryBabyPatientExtendEarFollowUpCount(BabyPatientExtendEarFollowUpQuery query);
 
     public List<BabyPatientExtendEarFollowUp> queryBabyPatientExtendEarFollowUp(BabyPatientExtendEarFollowUpQuery query);
+    public List<BabyPatientExtendEarFollowUp> queryBabyPatientExtendEarFollowUpByBaby(BabyPatientExtendEarFollowUpQuery query);
 
 }
\ No newline at end of file
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyPatientExtendEarFollowUpServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyPatientExtendEarFollowUpServiceImpl.java
index b74b950..4a734cb 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyPatientExtendEarFollowUpServiceImpl.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyPatientExtendEarFollowUpServiceImpl.java
@@ -48,4 +48,9 @@ public class BabyPatientExtendEarFollowUpServiceImpl implements BabyPatientExten
         return babyPatientExtendEarFollowUpMapper.queryBabyPatientExtendEarFollowUp(query);
     }
 
+    @Override
+    public List<BabyPatientExtendEarFollowUp> queryBabyPatientExtendEarFollowUpByBaby(BabyPatientExtendEarFollowUpQuery query) {
+        return babyPatientExtendEarFollowUpMapper.queryBabyPatientExtendEarFollowUpByBaby(query);
+    }
+
 }
\ No newline at end of file
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml
index 85beda1..217b23a 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml
@@ -268,6 +268,18 @@ select id,baby_id,follow_time,follow_addr,mark_time,mark_result,mark_detail,foll
         <include refid="orderAndLimit"/>
     </select>
 
+    <select id="queryBabyPatientExtendEarFollowUpByBaby" resultMap="BabyPatientExtendEarFollowUpResultMap" parameterType="com.lymsh.mommybaby.maindata.model.BabyPatientExtendEarFollowUpQuery">
+        select id,baby_id,follow_time,follow_addr,mark_time,mark_result,mark_detail,follow_info,audiphone,operation,artifi_cochlea,is_audiphone,is_operation,is_artifi_cochlea,guide_opinion,follow_doctor_name,follow_doctor_id,next_time,ifdel,ifclose,hospital_id,modify_time,modify_id,create_time,create_id,enalble
+        from baby_patient_extend_ear_follow_up
+
+        <where>
+        1 = 1
+        <if test="babyId != null and babyId != ''">
+            and baby_id = #{babyId,jdbcType=VARCHAR}
+        </if>
+        </where>
+    </select>
+
 
     <select id="queryBabyPatientExtendEarFollowUpCount" resultType="int"
             parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarFollowUpQuery">
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 a7d3dce..da14e2e 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
@@ -65,6 +65,10 @@ public class FollowUpController extends BaseController {
     @TokenRequired
     public BaseResponse getFollowUpList(String babyId, HttpServletRequest request) {
 
+        if(StringUtils.isEmpty(babyId)){
+            return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请传入儿童ID");
+        }
+
         BabyPatientExtendEarFollowUpQuery query = new BabyPatientExtendEarFollowUpQuery();
         query.setBabyId(babyId);
         //获取当前登录用户ID
@@ -73,8 +77,8 @@ public class FollowUpController extends BaseController {
             return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("请重新登录");
         }
         //当前登录人医院Id
-        String hospitalId = autoMatchFacade.getHospitalId(loginState.getId());
-        query.setHospitalId(hospitalId);
+        // String hospitalId = autoMatchFacade.getHospitalId(loginState.getId());
+        // query.setHospitalId(hospitalId);
 
         List<BabyPatientExtendEarFollowUp> followUpList = babyPatientExtendEarFollowUpService.queryBabyPatientExtendEarFollowUp(query);
         List<Map<String,String>> list = new ArrayList<>();
-- 
1.8.3.1