From 6a3e5d74f047714967c60b4b1df3ed854d1b0fb5 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Thu, 10 Oct 2019 15:31:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E6=B5=8B=E9=87=8F=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mainOrm/master/MeasureDataInfoMapper.xml |  3 +++
 .../platform/operate/web/facade/PatientFacade.java     | 18 +++++++-----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MeasureDataInfoMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/MeasureDataInfoMapper.xml
index e49c8fe..f283378 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/MeasureDataInfoMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/MeasureDataInfoMapper.xml
@@ -399,6 +399,9 @@
             <if test="todayCount != null and todayCount > 0">
                 AND today_count = #{todayCount,jdbcType=INTEGER}
             </if>
+            <if test="hospitalId != null">
+                AND hospital_id = #{hospitalId,jdbcType=VARCHAR}
+            </if>
 
             <if test="babyIds != null and babyIds.size > 0">
                 and baby_id in
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
index 7a05f32..a8ce258 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
@@ -1413,17 +1413,13 @@ public class PatientFacade {
                 } catch (Exception e) {
                     // 什么都不干
                 }
-//                if ("1000000114".equals(patients.getHospitalId())) {
-//                    patientManagerQueryModel.setPhone(patients.getPhone());
-//                    patientManagerQueryModel.setCardNo(patients.getCardNo());
-//                } else {
-//                    patientManagerQueryModel.setPhone(DefenceUtils.getPhone(patients.getPhone()));
-//                    patientManagerQueryModel.setCardNo(DefenceUtils.getCardNo(patients.getCardNo()));
-//                }
-
-                patientManagerQueryModel.setPhone(patients.getPhone());
-                patientManagerQueryModel.setCardNo(patients.getCardNo());
-
+                if ("1000000114".equals(patients.getHospitalId())) {
+                    patientManagerQueryModel.setPhone(patients.getPhone());
+                    patientManagerQueryModel.setCardNo(patients.getCardNo());
+                } else {
+                    patientManagerQueryModel.setPhone(DefenceUtils.getPhone(patients.getPhone()));
+                    patientManagerQueryModel.setCardNo(DefenceUtils.getCardNo(patients.getCardNo()));
+                }
                 patientManagerQueryModel.setBuildWeek(dueWeek);
 
                 String bookbuildingDoctor = "";
-- 
1.8.3.1