From 79ec28d5882efc5cdab4b30158fc4b044acef478 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Thu, 22 Apr 2021 17:26:56 +0800
Subject: [PATCH] update

---
 .../dao/master/MasterMysqlAntexcMapper.java        |   7 -
 .../service/impl/MysqlAntexcServiceImpl.java       |   2 -
 .../resources/mainOrm/master/MasterMysqlAntexc.xml | 170 +++++++++++++++------
 .../operate/web/controller/TestController.java     |   1 -
 .../operate/web/facade/PatientSyncMysqlFacade.java |  69 ++++++---
 5 files changed, 170 insertions(+), 79 deletions(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterMysqlAntexcMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterMysqlAntexcMapper.java
index 2af7309..f91a803 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterMysqlAntexcMapper.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterMysqlAntexcMapper.java
@@ -11,15 +11,8 @@ import java.util.Map;
 public interface MasterMysqlAntexcMapper {
     void saveMysqlAntexc(MysqlAntexc model);
 
-
-
     void deleteMysqlAntexc(MysqlAntexc model);
-
-
     void saveMysqlAntex(MysqlAntex model);
-
-
-
     void deleteMysqlAntex(MysqlAntex model);
 
     void addRisk(MysqlRisk model);
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MysqlAntexcServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MysqlAntexcServiceImpl.java
index 167a0f0..8c972dd 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MysqlAntexcServiceImpl.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MysqlAntexcServiceImpl.java
@@ -149,13 +149,11 @@ public class MysqlAntexcServiceImpl implements MysqlAntexcService {
     {
         masterMysqlAntexcMapper.deleteRiskLevelToMysql(reportRiskLevel);
     }
-
     @Override
     public void saveRiskLevelToMysql(ReportRiskLevel reportRiskLevel)
     {
         masterMysqlAntexcMapper.saveRiskLevelToMysql(reportRiskLevel);
     }
-
     @Override
     public List<Map<String,Object>> getBuildCount(Map param) {
         return masterMysqlAntexcMapper.getBuildCount(param);
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 d2afd0d..32f63a9 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml
@@ -1292,8 +1292,9 @@
 
 
     <select id="getBulidCheckPersonCount" resultType="java.util.Map" parameterType="java.util.Map">
-        SELECT count(DISTINCT(r.sourceId)) as bulidCheckPersonCount from  report_patients p
+        SELECT count(DISTINCT(r.sourceId)) as bulidCheckPersonCount,o.name as hospitalName from  report_patients p
         INNER JOIN report_antexchu r on p.patientId =  r.sourceId
+        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}
@@ -1304,13 +1305,23 @@
         <if test="endDate != null">
             and  p.bookbuildingDate <![CDATA[ <= ]]> #{endDate}
         </if>
-
+        <if test="provinceId != null and provinceId != ''">
+            and o.province_id = #{provinceId,jdbcType=VARCHAR}
+        </if>
+        <if test="cityId != null and cityId != ''">
+            and  o.city_id = #{cityId,jdbcType=VARCHAR}
+        </if>
+        <if test="areaId != null and areaId != ''">
+            and o.area_id = #{areaId,jdbcType=VARCHAR}
+        </if>
+        GROUP BY o.name
 
     </select>
 
     <select id="getBulidCheckNumCount" resultType="java.util.Map" parameterType="java.util.Map">
-        SELECT count(r.sourceId) as bulidCheckNumCount from  report_patients p
+        SELECT count(r.sourceId) as bulidCheckNumCount,o.name as hospitalName from  report_patients p
         INNER JOIN report_antexchu r on p.patientId =  r.sourceId
+        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}
@@ -1321,10 +1332,21 @@
         <if test="endDate != null">
             and  p.bookbuildingDate <![CDATA[ <= ]]> #{endDate}
         </if>
+        <if test="provinceId != null and provinceId != ''">
+            and o.province_id = #{provinceId,jdbcType=VARCHAR}
+        </if>
+        <if test="cityId != null and cityId != ''">
+            and  o.city_id = #{cityId,jdbcType=VARCHAR}
+        </if>
+        <if test="areaId != null and areaId != ''">
+            and o.area_id = #{areaId,jdbcType=VARCHAR}
+        </if>
+        GROUP BY o.name
     </select>
     <select id="getCheckPersonCount" resultType="java.util.Map" parameterType="java.util.Map">
-        SELECT count(DISTINCT(r.sourceId)) as checkPersonCount from  report_patients p
+        SELECT count(DISTINCT(r.sourceId)) as checkPersonCount,o.name as hospitalName from  report_patients p
         INNER JOIN report_antexchu r on p.patientId =  r.sourceId
+        INNER JOIN organization o on p.hospitalId=o.id
         where  p.type=1 and p.enable is NULL
 
         <if test="hospitalId != null and hospitalId != ''">
@@ -1336,11 +1358,22 @@
         <if test="endDate != null">
             and  r.checkTime <![CDATA[ <= ]]> #{endDate}
         </if>
+        <if test="provinceId != null and provinceId != ''">
+            and o.province_id = #{provinceId,jdbcType=VARCHAR}
+        </if>
+        <if test="cityId != null and cityId != ''">
+            and  o.city_id = #{cityId,jdbcType=VARCHAR}
+        </if>
+        <if test="areaId != null and areaId != ''">
+            and o.area_id = #{areaId,jdbcType=VARCHAR}
+        </if>
+        GROUP BY o.name
     </select>
 
     <select id="getMatDeliverCount" resultType="java.util.Map" parameterType="java.util.Map">
-        select count(m.sourceId) as matDeliverCount from report_matdeliver m
+        select count(m.sourceId) as matDeliverCount,o.name as hospitalName from report_matdeliver m
         INNER JOIN report_patients p on m.sourceId=p.patientId
+        INNER JOIN organization o on p.hospitalId=o.id
         where p.type =3 and p.enable is NULL
         <if test="hospitalId != null and hospitalId != ''">
             and p.hospitalId = #{hospitalId,jdbcType=VARCHAR}
@@ -1351,10 +1384,21 @@
         <if test="endDate != null">
             and  p.bookbuildingDate <![CDATA[ <= ]]> #{endDate}
         </if>
+        <if test="provinceId != null and provinceId != ''">
+            and o.province_id = #{provinceId,jdbcType=VARCHAR}
+        </if>
+        <if test="cityId != null and cityId != ''">
+            and  o.city_id = #{cityId,jdbcType=VARCHAR}
+        </if>
+        <if test="areaId != null and areaId != ''">
+            and o.area_id = #{areaId,jdbcType=VARCHAR}
+        </if>
+        GROUP BY o.name
     </select>
 
     <select id="getLiveCount" resultType="java.util.Map" parameterType="java.util.Map">
-        select count(p.patientId) as liveCount from report_patients p
+        select count(p.patientId) as liveCount,o.name as hospitalName from report_patients p
+        INNER JOIN organization o on p.hospitalId=o.id
         where p.pliveTypeId='57624c5e0cf23d4631523ea2' and  p.enable is NULL
         <if test="hospitalId != null and hospitalId != ''">
             and p.hospitalId = #{hospitalId,jdbcType=VARCHAR}
@@ -1365,7 +1409,16 @@
         <if test="endDate != null">
             and  p.bookbuildingDate <![CDATA[ <= ]]> #{endDate}
         </if>
-
+        <if test="provinceId != null and provinceId != ''">
+            and o.province_id = #{provinceId,jdbcType=VARCHAR}
+        </if>
+        <if test="cityId != null and cityId != ''">
+            and  o.city_id = #{cityId,jdbcType=VARCHAR}
+        </if>
+        <if test="areaId != null and areaId != ''">
+            and o.area_id = #{areaId,jdbcType=VARCHAR}
+        </if>
+        GROUP BY o.name
     </select>
 
 
@@ -1423,10 +1476,10 @@
         </if>
         ) tp
         INNER JOIN
-        (SELECT c.sourceId as sourceId,c.hospitalId from report_risk_level r
-        INNER  JOIN report_antexchu c on r.foreignId = c.cid  where r.type = 2 and c.type=1 and riskLevel > 1 )
-        l on tp.patientId=l.sourceId
+        report_antexchu l on  tp.patientId=l.sourceId
+        INNER JOIN report_risk_level r on r.foreignId = l.cid
         INNER JOIN organization o on l.hospitalId=o.id
+        where r.type = 2 and c.type=1 and riskLevel > 1
         GROUP BY o.name
     </select>
 
@@ -1445,10 +1498,11 @@
         </if>
         ) tp
         INNER JOIN
-        (SELECT DISTINCT(c.sourceId) as sourceId ,c.hospitalId from report_risk_level r
-        INNER  JOIN report_antexchu c on r.foreignId = c.cid  where r.type = 2 and c.type=1 and riskLevel = 2 )
-        l on tp.patientId=l.sourceId
-        INNER JOIN organization o on l.hospitalId=o.id  GROUP BY o.name
+        report_antexchu l on  tp.patientId=l.sourceId
+        INNER JOIN report_risk_level r on r.foreignId = l.cid
+        INNER JOIN organization o on l.hospitalId=o.id
+        where r.type = 2 and c.type=1 and riskLevel = 2
+        GROUP BY o.name
     </select>
     <select id="getColorOrangeCounts" resultType="java.util.Map" parameterType="java.util.Map">
 
@@ -1466,10 +1520,11 @@
         </if>
         ) tp
         INNER JOIN
-        (SELECT DISTINCT(c.sourceId) as sourceId ,c.hospitalId from report_risk_level r
-        INNER  JOIN report_antexchu c on r.foreignId = c.cid  where r.type = 2 and c.type=1 and riskLevel = 3 )
-        l on tp.patientId=l.sourceId
-        INNER JOIN organization o on l.hospitalId=o.id  GROUP BY o.name
+        report_antexchu l on  tp.patientId=l.sourceId
+        INNER JOIN report_risk_level r on r.foreignId = l.cid
+        INNER JOIN organization o on l.hospitalId=o.id
+        where r.type = 2 and c.type=1 and riskLevel = 3
+        GROUP BY o.name
 
     </select>
 
@@ -1489,10 +1544,11 @@
         </if>
         ) tp
         INNER JOIN
-        (SELECT DISTINCT(c.sourceId) as sourceId ,c.hospitalId from report_risk_level r
-        INNER  JOIN report_antexchu c on r.foreignId = c.cid  where r.type = 2 and c.type=1 and riskLevel = 4 )
-        l on tp.patientId=l.sourceId
-        INNER JOIN organization o on l.hospitalId=o.id  GROUP BY o.name
+        report_antexchu l on  tp.patientId=l.sourceId
+        INNER JOIN report_risk_level r on r.foreignId = l.cid
+        INNER JOIN organization o on l.hospitalId=o.id
+        where r.type = 2 and c.type=1 and riskLevel = 4
+        GROUP BY o.name
 
 
     </select>
@@ -1515,10 +1571,11 @@
         </if>
         ) tp
         INNER JOIN
-        (SELECT DISTINCT(c.sourceId) as sourceId ,c.hospitalId from report_risk_level r
-        INNER  JOIN report_antexchu c on r.foreignId = c.cid  where r.type = 2 and c.type=1 and riskLevel = 5 )
-        l on tp.patientId=l.sourceId
-        INNER JOIN organization o on l.hospitalId=o.id  GROUP BY o.name
+        report_antexchu l on  tp.patientId=l.sourceId
+        INNER JOIN report_risk_level r on r.foreignId = l.cid
+        INNER JOIN organization o on l.hospitalId=o.id
+        where r.type = 2 and c.type=1 and riskLevel = 5
+        GROUP BY o.name
 
     </select>
 
@@ -1539,16 +1596,17 @@
         </if>
         ) tp
         INNER JOIN
-        (SELECT DISTINCT(c.sourceId) as sourceId ,c.hospitalId from report_risk_level r
-        INNER  JOIN report_antexchu c on r.foreignId = c.cid  where r.type = 2 and c.type=1 and riskLevel = 1 )
-        l on tp.patientId=l.sourceId
-        INNER JOIN organization o on l.hospitalId=o.id  GROUP BY o.name
+        report_antexchu l on  tp.patientId=l.sourceId
+        INNER JOIN report_risk_level r on r.foreignId = l.cid
+        INNER JOIN organization o on l.hospitalId=o.id
+        where r.type = 2 and c.type=1 and riskLevel = 1
+        GROUP BY o.name
     </select>
 
     <select id="getOneRiskCounts" resultType="java.util.Map" parameterType="java.util.Map">
-        select count(l.sourceId) as oneRiskCount,tp.name as hospitalName,tp.id as hospitalId  from (select  p.patientId,o.id,o.name  from report_patients p
+        select count(a.sourceId) as oneRiskCount,tp.name as hospitalName,tp.id as hospitalId  from (select  p.patientId,o.id,o.name  from report_patients p
         INNER JOIN organization o on p.hospitalId=o.id
-        where p.hospitalId=#{hospitalId} and p.type=1 and p.enable is NULL
+        where p.type=1 and p.enable is NULL and     p.hospitalId=#{hospitalId}
         <if test="startDate != null">
             and p.bookbuildingDate >= #{startDate}
         </if>
@@ -1556,18 +1614,20 @@
             and p.bookbuildingDate <![CDATA[ <= ]]> #{endDate}
         </if>
         ) tp
+        INNER JOIN report_antexchu a
+        on tp.patientId=a.sourceId
         INNER JOIN
         (
-        SELECT r.foreignId,count(r.foreignId) as t,r.type,r.riskLevel,c.sourceId from report_risk_level r LEFT JOIN report_antexchu c on r.foreignId = c.cid
-        group by r.foreignId having t=1 and r.type = 2 and r.riskLevel  >1
-        ) l on tp.patientId=l.sourceId GROUP BY tp.name
+        SELECT r.foreignId,count(r.foreignId) as t,r.type,r.riskLevel from report_risk_level r
+        where r.type = 2 and r.riskLevel  >1 group by r.foreignId having t=1
+        ) l on l.foreignId = a.cid GROUP BY tp.name
     </select>
 
 
     <select id="getTwoRiskCounts" resultType="java.util.Map" parameterType="java.util.Map">
-        select count(l.sourceId) as twoRiskCount,tp.name as hospitalName,tp.id as hospitalId  from (select  p.patientId,o.id,o.name  from report_patients p
+        select count(a.sourceId) as twoRiskCount,tp.name as hospitalName,tp.id as hospitalId  from (select  p.patientId,o.id,o.name  from report_patients p
         INNER JOIN organization o on p.hospitalId=o.id
-        where p.hospitalId=#{hospitalId} and p.type=1 and p.enable is NULL
+        where p.type=1 and p.enable is NULL and     p.hospitalId=#{hospitalId}
         <if test="startDate != null">
             and p.bookbuildingDate >= #{startDate}
         </if>
@@ -1575,19 +1635,23 @@
             and p.bookbuildingDate <![CDATA[ <= ]]> #{endDate}
         </if>
         ) tp
+        INNER JOIN report_antexchu a
+        on tp.patientId=a.sourceId
         INNER JOIN
         (
-        SELECT r.foreignId,count(r.foreignId) as t,r.type,r.riskLevel,c.sourceId from report_risk_level r LEFT JOIN report_antexchu c on r.foreignId = c.cid
-        group by r.foreignId having t=2 and r.type = 2 and r.riskLevel  >1
-        ) l on tp.patientId=l.sourceId GROUP BY tp.name
+        SELECT r.foreignId,count(r.foreignId) as t,r.type,r.riskLevel from report_risk_level r
+        where r.type = 2 and r.riskLevel  >1 group by r.foreignId having t=2
+        ) l on l.foreignId = a.cid GROUP BY tp.name
     </select>
 
 
 
     <select id="getThreeRiskCounts" resultType="java.util.Map" parameterType="java.util.Map">
-        select count(l.sourceId) as threeRiskCount,tp.name as hospitalName,tp.id as hospitalId  from (select  p.patientId,o.id,o.name  from report_patients p
+
+
+        select count(a.sourceId) as threeRiskCount,tp.name as hospitalName,tp.id as hospitalId  from (select  p.patientId,o.id,o.name  from report_patients p
         INNER JOIN organization o on p.hospitalId=o.id
-        where p.hospitalId=#{hospitalId} and p.type=1 and p.enable is NULL
+        where p.type=1 and p.enable is NULL and     p.hospitalId=#{hospitalId}
         <if test="startDate != null">
             and p.bookbuildingDate >= #{startDate}
         </if>
@@ -1595,18 +1659,22 @@
             and p.bookbuildingDate <![CDATA[ <= ]]> #{endDate}
         </if>
         ) tp
+        INNER JOIN report_antexchu a
+        on tp.patientId=a.sourceId
         INNER JOIN
         (
-        SELECT r.foreignId,count(r.foreignId) as t,r.type,r.riskLevel,c.sourceId from report_risk_level r LEFT JOIN report_antexchu c on r.foreignId = c.cid
-        group by r.foreignId having t=3 and r.type = 2 and r.riskLevel  >1
-        ) l on tp.patientId=l.sourceId GROUP BY tp.name
+        SELECT r.foreignId,count(r.foreignId) as t,r.type,r.riskLevel from report_risk_level r
+        where r.type = 2 and r.riskLevel  >1 group by r.foreignId having t=3
+        ) l on l.foreignId = a.cid GROUP BY tp.name
+
     </select>
 
 
     <select id="getFourRiskCounts" resultType="java.util.Map" parameterType="java.util.Map">
-        select count(l.sourceId) as fourRiskCount,tp.name as hospitalName,tp.id as hospitalId  from (select  p.patientId,o.id,o.name  from report_patients p
+
+        select count(a.sourceId) as fourRiskCount,tp.name as hospitalName,tp.id as hospitalId  from (select  p.patientId,o.id,o.name  from report_patients p
         INNER JOIN organization o on p.hospitalId=o.id
-        where p.hospitalId=#{hospitalId} and p.type=1 and p.enable is NULL
+        where p.type=1 and p.enable is NULL and     p.hospitalId=#{hospitalId}
         <if test="startDate != null">
             and p.bookbuildingDate >= #{startDate}
         </if>
@@ -1614,11 +1682,13 @@
             and p.bookbuildingDate <![CDATA[ <= ]]> #{endDate}
         </if>
         ) tp
+        INNER JOIN report_antexchu a
+        on tp.patientId=a.sourceId
         INNER JOIN
         (
-        SELECT r.foreignId,count(r.foreignId) as t,r.type,r.riskLevel,c.sourceId from report_risk_level r LEFT JOIN report_antexchu c on r.foreignId = c.cid
-        group by r.foreignId having t=4 and r.type = 2 and r.riskLevel  >1
-        ) l on tp.patientId=l.sourceId GROUP BY tp.name
+        SELECT r.foreignId,count(r.foreignId) as t,r.type,r.riskLevel from report_risk_level r
+        where r.type = 2 and r.riskLevel  >1 group by r.foreignId having t=3
+        ) l on l.foreignId = a.cid GROUP BY tp.name
     </select>
 
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
index 0535ba9..95d9982 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
@@ -4265,7 +4265,6 @@ public class TestController extends BaseController {
 
 
 
-
     @ResponseBody
     @RequestMapping(value = "/syncAntexToMysql", method = RequestMethod.GET)
     public String syncAntexToMysql(@RequestParam(required =  false) Date startDate,@RequestParam(required =  false) Date endDate) {
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 7ae5a0b..f20241f 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
@@ -1287,6 +1287,7 @@ public class PatientSyncMysqlFacade {
         while (true)
         {
             patientsQuery.setPage(page);
+            System.out.println("syncPatientsToMysql" + page);
             List<Patients> patientses = patientsService.queryPatient(patientsQuery);
             if (CollectionUtils.isEmpty(patientses))
             {
@@ -1327,6 +1328,7 @@ public class PatientSyncMysqlFacade {
         while (true)
         {
             antExChuQuery.setPage(page);
+            System.out.println("syncAntexchuToMysql"+page);
             List <AntExChuModel> antExChus = antenatalExaminationService.queryAntExChu(antExChuQuery);
             if (CollectionUtils.isEmpty(antExChus))
             {
@@ -1551,6 +1553,12 @@ public class PatientSyncMysqlFacade {
         param.put("cityId",cityId);
         param.put("areaId", areaId);
         List<Map<String,Object>> bulidsCount =  mysqlAntexcService.getBuildCount(param);
+        List<Map<String,String>> bulidCheckPersonCounts =  mysqlAntexcService.getBulidCheckPersonCount(param);
+        List<Map<String,String>> bulidCheckNumCounts =  mysqlAntexcService.getBulidCheckNumCount(param);
+        List<Map<String,String>> checkPersonCounts =  mysqlAntexcService.getCheckPersonCount(param);
+        List<Map<String,String>> matDeliverCounts =  mysqlAntexcService.getMatDeliverCount(param);
+        List<Map<String,String>> liveCounts =  mysqlAntexcService.getLiveCount(param);
+
 
         if (CollectionUtils.isNotEmpty(bulidsCount))
         {
@@ -1560,6 +1568,7 @@ public class PatientSyncMysqlFacade {
                 String provId = String.valueOf(map.get("provinceId"));
                 String cId = String.valueOf(map.get("cityId"));
                 String aId = String.valueOf(map.get("areaId"));
+                String hospitalName = String.valueOf(map.get("hospitalName"));
                 String provinceName = getAddressName(provId);
                 String cityName = getAddressName(cId);
                 String areaName = getAddressName(aId);
@@ -1568,47 +1577,69 @@ public class PatientSyncMysqlFacade {
                 map.put("cityName",cityName);
                 map.put("areaName",areaName);
 
-                Map param1 = new HashMap();
-                param1.put("startDate",startDate);
-                param1.put("endDate",endDate);
-                param1.put("hospitalId",map.get("hospitalId"));
-                List<Map<String,String>> bulidCheckPersonCounts =  mysqlAntexcService.getBulidCheckPersonCount(param1);
-
                 //建档产检人数
                 long bulidCheckPersonCount = 0;
                 if (CollectionUtils.isNotEmpty(bulidCheckPersonCounts)) {
-                    bulidCheckPersonCount = Integer.valueOf(String.valueOf(bulidCheckPersonCounts.get(0).get("bulidCheckPersonCount")));
+                    for (Map<String, String> checkData : bulidCheckPersonCounts) {
+                        if (hospitalName.equals(checkData.get("hospitalName")))
+                        {
+                            bulidCheckPersonCount = Long.valueOf(String.valueOf(checkData.get("bulidCheckPersonCount")));
+                            break;
+                        }
+                    }
                 }
                 map.put("bulidCheckPersonCount",bulidCheckPersonCount);
 
 
-                List<Map<String,String>> bulidCheckNumCounts =  mysqlAntexcService.getBulidCheckNumCount(param1);
+
                 //建档产检人次统计
-                int bulidCheckNumCount = 0;
+                long bulidCheckNumCount = 0;
                 if (CollectionUtils.isNotEmpty(bulidCheckNumCounts)) {
-                    bulidCheckNumCount =  Integer.valueOf(String.valueOf(bulidCheckNumCounts.get(0).get("bulidCheckNumCount")));
+                    for (Map<String, String> checkData : bulidCheckNumCounts) {
+                        if (hospitalName.equals(checkData.get("hospitalName")))
+                        {
+                            bulidCheckNumCount = Long.valueOf(String.valueOf(checkData.get("bulidCheckNumCount")));
+                            break;
+                        }
+                    }
                 }
                 map.put("bulidCheckNumCount",bulidCheckNumCount);
 
                 //产检时间的产检人数统计
-                List<Map<String,String>> checkPersonCounts =  mysqlAntexcService.getCheckPersonCount(param1);
-                int checkPersonCount = 0;
+
+                long checkPersonCount = 0;
                 if (CollectionUtils.isNotEmpty(checkPersonCounts)) {
-                    checkPersonCount =  Integer.valueOf(String.valueOf(checkPersonCounts.get(0).get("checkPersonCount")));
+                    for (Map<String, String> checkData : checkPersonCounts) {
+                        if (hospitalName.equals(checkData.get("hospitalName")))
+                        {
+                            checkPersonCount = Long.valueOf(String.valueOf(checkData.get("checkPersonCount")));
+                            break;
+                        }
+                    }
                 }
                 map.put("checkPersonCount",checkPersonCount);
 
-                int matDeliverCount = 0;
-                List<Map<String,String>> matDeliverCounts =  mysqlAntexcService.getMatDeliverCount(param1);
+                long matDeliverCount = 0;
                 if (CollectionUtils.isNotEmpty(matDeliverCounts)) {
-                    matDeliverCount =  Integer.valueOf(String.valueOf(matDeliverCounts.get(0).get("matDeliverCount")));
+                    for (Map<String, String> checkData : matDeliverCounts) {
+                        if (hospitalName.equals(checkData.get("hospitalName")))
+                        {
+                            matDeliverCount = Long.valueOf(String.valueOf(checkData.get("matDeliverCount")));
+                            break;
+                        }
+                    }
                 }
                 map.put("matDeliverCount",matDeliverCount);
 
-                List<Map<String,String>> liveCounts =  mysqlAntexcService.getLiveCount(param1);
-                int liveCount = 0;
+                long liveCount = 0;
                 if (CollectionUtils.isNotEmpty(liveCounts)) {
-                    liveCount =  Integer.valueOf(String.valueOf(liveCounts.get(0).get("liveCount")));
+                    for (Map<String, String> checkData : liveCounts) {
+                        if (hospitalName.equals(checkData.get("hospitalName")))
+                        {
+                            liveCount = Long.valueOf(String.valueOf(checkData.get("liveCount")));
+                            break;
+                        }
+                    }
                 }
                 map.put("liveCount",liveCount);
             }
-- 
1.8.3.1