From 233455845461f2a044525674fb8825459059b47e Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Fri, 16 Apr 2021 10:19:36 +0800
Subject: [PATCH] update

---
 .../src/main/resources/mainOrm/master/MasterMysqlAntexc.xml        | 7 ++++---
 .../lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java   | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml
index caaffd2..f6da8fb 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml
@@ -1267,15 +1267,16 @@
         select count(p.patientId) as buildCount,o.id as hospitalId,o.name as hospitalName,o.province_id as provinceId,o.area_id as areaId,o.city_id as cityId from report_patients p
         INNER JOIN organization o on p.hospitalId=o.id
         where  p.type=1 and p.enable is NULL
+
+        <if test="hospitalId != null and hospitalId != ''">
+            and p.hospitalId = #{hospitalId,jdbcType=VARCHAR}
+        </if>
         <if test="startDate != null">
             and p.bookbuildingDate >= #{startDate}
         </if>
         <if test="endDate != null">
             and  p.bookbuildingDate <![CDATA[ <= ]]> #{endDate}
         </if>
-        <if test="hospitalId != null and hospitalId != ''">
-            and p.hospitalId = #{hospitalId,jdbcType=VARCHAR}
-        </if>
         <if test="provinceId != null and provinceId != ''">
             and o.province_id = #{provinceId,jdbcType=VARCHAR}
         </if>
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java
index a5fbb69..daa5918 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java
@@ -1600,13 +1600,13 @@ public class PatientSyncMysqlFacade {
                 map.put("checkPersonCount",checkPersonCount);
 
                 int matDeliverCount = 0;
-                List<Map<String,String>> matDeliverCounts =  mysqlAntexcService.getMatDeliverCount(param);
+                List<Map<String,String>> matDeliverCounts =  mysqlAntexcService.getMatDeliverCount(param1);
                 if (CollectionUtils.isNotEmpty(matDeliverCounts)) {
                     matDeliverCount =  Integer.valueOf(String.valueOf(matDeliverCounts.get(0).get("matDeliverCount")));
                 }
                 map.put("matDeliverCount",matDeliverCount);
 
-                List<Map<String,String>> liveCounts =  mysqlAntexcService.getLiveCount(param);
+                List<Map<String,String>> liveCounts =  mysqlAntexcService.getLiveCount(param1);
                 int liveCount = 0;
                 if (CollectionUtils.isNotEmpty(liveCounts)) {
                     liveCount =  Integer.valueOf(String.valueOf(liveCounts.get(0).get("liveCount")));
-- 
1.8.3.1