From 7e129cb76679776b5b996d10fb6ebd0f0e2a2fdb Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Tue, 29 Aug 2017 17:57:08 +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

---
 .../resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml  | 4 +++-
 .../platform/operate/web/controller/HearDiagnManageController.java    | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

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 e0dbf3a..d2d899e 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml
@@ -953,7 +953,9 @@ select id,baby_id,hospital_id,diagnose_time,high_factor,abr_left_dbnhl,abr_left_
                 DATEDIFF(#{confirmEndTime},hd.confirm_time) >=0
                 ]]>
             </if>
-
+            <if test="hospitalId != null and hospitalId != ''">
+                and hospital_id = #{hospitalId,jdbcType=VARCHAR},
+            </if>
             <if test="babyIds!=null">
                 and baby_id in (
                 <foreach item="babyId" collection="babyIds" separator="," >
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 c31ded6..b7eb88d 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
@@ -321,6 +321,7 @@ public class HearDiagnManageController extends BaseController {
         BabyPatientExtendEarHearingDiagnoseQuery query = new BabyPatientExtendEarHearingDiagnoseQuery();
 
         query.setHospitalId(hospitalId);
+
         if (hdReq.getDiagnDoctorId() != null) {//诊断医生
             query.setDiagnDoctorId(hdReq.getDiagnDoctorId());
         }
-- 
1.8.3.1