From bab1e52d2d81585c342b68d23cd11f73823b9be3 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Tue, 29 Aug 2017 17:47:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=AC=E5=8A=9B=E8=AF=8A=E6=96=AD=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mainOrm/master/BabyPatientExtendEarFollowUp.xml  | 20 ++++++++++++++------
 .../master/BabyPatientExtendEarHearingDiagnose.xml   |  6 ++++++
 .../web/controller/HearDiagnManageController.java    |  4 +---
 3 files changed, 21 insertions(+), 9 deletions(-)

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 5d380d5..c28d0f1 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml
@@ -277,15 +277,23 @@ select id,baby_id,follow_time,follow_addr,mark_time,mark_result,mark_detail,foll
         <include refid="BabyPatientExtendEarFollowUpCondition"/>
     </select>
 
-    <select id="queryBabyPatientExtendEarFollowUpByBaby" resultMap="BabyPatientExtendEarFollowUpResultMap" parameterType="com.lyms.platform.permission.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,verdict,hospital_id,modify_time,modify_id,create_time,create_id,enalble
+    <select id="queryBabyPatientExtendEarFollowUpByBaby" resultMap="BabyPatientExtendEarFollowUpResultMap"
+            parameterType="com.lyms.platform.permission.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,verdict,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>
+            1 = 1
+            <if test="babyId != null and babyId != ''">
+                and baby_id = #{babyId,jdbcType=VARCHAR}
+            </if>
+            <if test="babyIds != null ">
+                and baby_id in
+                <foreach item="item" index="index" collection="babyIds" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
             and ifdel = 0
         </where>
     </select>
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml
index 597269a..e0dbf3a 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml
@@ -464,6 +464,12 @@ select id,baby_id,hospital_id,diagnose_time,high_factor,abr_left_dbnhl,abr_left_
             <if test="babyId != null and babyId != ''">
                 and baby_id = #{babyId,jdbcType=VARCHAR}
             </if>
+            <if test="babyIds != null ">
+                and baby_id in
+                <foreach item="item" index="index" collection="babyIds" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
             <if test="hospitalId != null and hospitalId != ''">
                 and hospital_id = #{hospitalId,jdbcType=VARCHAR}
             </if>
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java
index a824cd8..c31ded6 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java
@@ -914,10 +914,8 @@ public class HearDiagnManageController extends BaseController {
         if (model.getDiagnDoctorId() != null) {
             screenQuery.setCheckDoctorId(model.getDiagnDoctorId());
         }
-        if(CollectionUtils.isNotEmpty(babyIds)){
-            screenQuery.setBabyIds(babyIds.toArray(new String[babyIds.size()]));
-        }
         screenQuery.setCheckHospitalId(hospitalId);
+
         //查询全部数据
         List<BabyPatientExtendEarScreen> earScreens = screenService.queryBabyPatientExtendEarScreen(screenQuery);
         Map<String, BabyPatientExtendEarScreen> screenMap = new HashMap<>();
-- 
1.8.3.1