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 840cd6f..2af7309 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 @@ -71,7 +71,7 @@ public interface MasterMysqlAntexcMapper { void saveRiskLevelToMysql(ReportRiskLevel reportRiskLevel); - List> getBuildCount(Map param); + List> getBuildCount(Map param); List> getBulidCheckPersonCount(Map param); diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/MysqlAntexcService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/MysqlAntexcService.java index 67fa7e4..27857ff 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/MysqlAntexcService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/MysqlAntexcService.java @@ -67,7 +67,7 @@ public interface MysqlAntexcService { void saveRiskLevelToMysql(ReportRiskLevel reportRiskLevel); - List> getBuildCount(Map param); + List> getBuildCount(Map param); List> getBulidCheckPersonCount(Map param); 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 df36062..69a01b0 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 @@ -157,7 +157,7 @@ public class MysqlAntexcServiceImpl implements MysqlAntexcService { } @Override - public List> getBuildCount(Map param) { + public List> getBuildCount(Map param) { return masterMysqlAntexcMapper.getBuildCount(param); } @Override 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 76835d7..0711c7e 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 @@ -1551,16 +1551,16 @@ public class PatientSyncMysqlFacade { param.put("provinceId",provinceId); param.put("cityId",cityId); param.put("areaId", areaId); - List> bulidsCount = mysqlAntexcService.getBuildCount(param); + List> bulidsCount = mysqlAntexcService.getBuildCount(param); if (CollectionUtils.isNotEmpty(bulidsCount)) { - for (Map map : bulidsCount) + for (Map map : bulidsCount) { - String provId = map.get("provinceId"); - String cId = map.get("cityId"); - String aId = map.get("areaId"); + String provId = String.valueOf(map.get("provinceId")); + String cId = String.valueOf(map.get("cityId")); + String aId = String.valueOf(map.get("areaId")); String provinceName = getAddressName(provId); String cityName = getAddressName(cId); String areaName = getAddressName(aId); @@ -1576,40 +1576,40 @@ public class PatientSyncMysqlFacade { List> bulidCheckPersonCounts = mysqlAntexcService.getBulidCheckPersonCount(param1); //建档产检人数 - String bulidCheckPersonCount ="0"; + long bulidCheckPersonCount = 0; if (CollectionUtils.isNotEmpty(bulidCheckPersonCounts)) { - bulidCheckPersonCount = String.valueOf(bulidCheckPersonCounts.get(0).get("bulidCheckPersonCount")); + bulidCheckPersonCount = Integer.valueOf(String.valueOf(bulidCheckPersonCounts.get(0).get("bulidCheckPersonCount"))); } map.put("bulidCheckPersonCount",bulidCheckPersonCount); List> bulidCheckNumCounts = mysqlAntexcService.getBulidCheckNumCount(param1); //建档产检人次统计 - String bulidCheckNumCount ="0"; + int bulidCheckNumCount = 0; if (CollectionUtils.isNotEmpty(bulidCheckNumCounts)) { - bulidCheckNumCount = String.valueOf(bulidCheckNumCounts.get(0).get("bulidCheckNumCount")); + bulidCheckNumCount = Integer.valueOf(String.valueOf(bulidCheckNumCounts.get(0).get("bulidCheckNumCount"))); } map.put("bulidCheckNumCount",bulidCheckNumCount); //产检时间的产检人数统计 List> checkPersonCounts = mysqlAntexcService.getCheckPersonCount(param1); - String checkPersonCount ="0"; + int checkPersonCount = 0; if (CollectionUtils.isNotEmpty(checkPersonCounts)) { - checkPersonCount = String.valueOf(checkPersonCounts.get(0).get("checkPersonCount")); + checkPersonCount = Integer.valueOf(String.valueOf(checkPersonCounts.get(0).get("checkPersonCount"))); } map.put("checkPersonCount",checkPersonCount); - String matDeliverCount ="0"; + int matDeliverCount = 0; List> matDeliverCounts = mysqlAntexcService.getMatDeliverCount(param); if (CollectionUtils.isNotEmpty(matDeliverCounts)) { - matDeliverCount = String.valueOf(matDeliverCounts.get(0).get("matDeliverCount")); + matDeliverCount = Integer.valueOf(String.valueOf(matDeliverCounts.get(0).get("matDeliverCount"))); } map.put("matDeliverCount",matDeliverCount); List> liveCounts = mysqlAntexcService.getLiveCount(param); - String liveCount ="0"; + int liveCount = 0; if (CollectionUtils.isNotEmpty(liveCounts)) { - liveCount = String.valueOf(liveCounts.get(0).get("liveCount")); + liveCount = Integer.valueOf(String.valueOf(liveCounts.get(0).get("liveCount"))); } map.put("liveCount",liveCount); } @@ -1623,7 +1623,7 @@ public class PatientSyncMysqlFacade { List ldNum = new ArrayList<>(); if (StringUtils.isNotEmpty(hospitalId) || StringUtils.isNotEmpty(areaId)) { - for (Map map : bulidsCount) { + for (Map map : bulidsCount) { chartData.add(map.get("hospitalName").toString()); jdNum.add(getInteger(map.get("buildCount"))); cjNum.add(getInteger(map.get("bulidCheckPersonCount"))); @@ -1665,14 +1665,14 @@ public class PatientSyncMysqlFacade { } - private void getData(List> bulidsCount, + private void getData(List> bulidsCount, List jdNum, List cjNum, List cjrcNum, List checkNum, List fmNum, List ldNum, List chartData, String idKey, String nameKey ) { Map result = new LinkedHashMap<>(); - for (Map map : bulidsCount) { + for (Map map : bulidsCount) { String key = "buildCount:" + map.get(idKey).toString() + ":" + map.get(nameKey).toString(); if (result.get(key) != null) {