jiangjiazhi / regional-platform

Download as
Browse Code »

Commit f42c9759492fb00e50661ab9102321bfcf9df342

Authored by liquanyu
1 parent 0db77de8e6
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 4 changed files with 21 additions and 21 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterMysqlAntexcMapper.java View file @ f42c975
... ... @@ -71,7 +71,7 @@
71 71  
72 72 void saveRiskLevelToMysql(ReportRiskLevel reportRiskLevel);
73 73  
74   - List<Map<String,String>> getBuildCount(Map param);
  74 + List<Map<String,Object>> getBuildCount(Map param);
75 75  
76 76 List<Map<String,String>> getBulidCheckPersonCount(Map param);
77 77  
platform-biz-service/src/main/java/com/lyms/platform/permission/service/MysqlAntexcService.java View file @ f42c975
... ... @@ -67,7 +67,7 @@
67 67  
68 68 void saveRiskLevelToMysql(ReportRiskLevel reportRiskLevel);
69 69  
70   - List<Map<String,String>> getBuildCount(Map param);
  70 + List<Map<String,Object>> getBuildCount(Map param);
71 71  
72 72 List<Map<String,String>> getBulidCheckPersonCount(Map param);
73 73  
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MysqlAntexcServiceImpl.java View file @ f42c975
... ... @@ -157,7 +157,7 @@
157 157 }
158 158  
159 159 @Override
160   - public List<Map<String, String>> getBuildCount(Map param) {
  160 + public List<Map<String,Object>> getBuildCount(Map param) {
161 161 return masterMysqlAntexcMapper.getBuildCount(param);
162 162 }
163 163 @Override
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java View file @ f42c975
... ... @@ -1551,16 +1551,16 @@
1551 1551 param.put("provinceId",provinceId);
1552 1552 param.put("cityId",cityId);
1553 1553 param.put("areaId", areaId);
1554   - List<Map<String,String>> bulidsCount = mysqlAntexcService.getBuildCount(param);
  1554 + List<Map<String,Object>> bulidsCount = mysqlAntexcService.getBuildCount(param);
1555 1555  
1556 1556 if (CollectionUtils.isNotEmpty(bulidsCount))
1557 1557 {
1558 1558  
1559   - for (Map<String,String> map : bulidsCount)
  1559 + for (Map<String,Object> map : bulidsCount)
1560 1560 {
1561   - String provId = map.get("provinceId");
1562   - String cId = map.get("cityId");
1563   - String aId = map.get("areaId");
  1561 + String provId = String.valueOf(map.get("provinceId"));
  1562 + String cId = String.valueOf(map.get("cityId"));
  1563 + String aId = String.valueOf(map.get("areaId"));
1564 1564 String provinceName = getAddressName(provId);
1565 1565 String cityName = getAddressName(cId);
1566 1566 String areaName = getAddressName(aId);
1567 1567  
1568 1568  
1569 1569  
1570 1570  
1571 1571  
1572 1572  
1573 1573  
1574 1574  
1575 1575  
... ... @@ -1576,40 +1576,40 @@
1576 1576 List<Map<String,String>> bulidCheckPersonCounts = mysqlAntexcService.getBulidCheckPersonCount(param1);
1577 1577  
1578 1578 //建档产检人数
1579   - String bulidCheckPersonCount ="0";
  1579 + long bulidCheckPersonCount = 0;
1580 1580 if (CollectionUtils.isNotEmpty(bulidCheckPersonCounts)) {
1581   - bulidCheckPersonCount = String.valueOf(bulidCheckPersonCounts.get(0).get("bulidCheckPersonCount"));
  1581 + bulidCheckPersonCount = Integer.valueOf(String.valueOf(bulidCheckPersonCounts.get(0).get("bulidCheckPersonCount")));
1582 1582 }
1583 1583 map.put("bulidCheckPersonCount",bulidCheckPersonCount);
1584 1584  
1585 1585  
1586 1586 List<Map<String,String>> bulidCheckNumCounts = mysqlAntexcService.getBulidCheckNumCount(param1);
1587 1587 //建档产检人次统计
1588   - String bulidCheckNumCount ="0";
  1588 + int bulidCheckNumCount = 0;
1589 1589 if (CollectionUtils.isNotEmpty(bulidCheckNumCounts)) {
1590   - bulidCheckNumCount = String.valueOf(bulidCheckNumCounts.get(0).get("bulidCheckNumCount"));
  1590 + bulidCheckNumCount = Integer.valueOf(String.valueOf(bulidCheckNumCounts.get(0).get("bulidCheckNumCount")));
1591 1591 }
1592 1592 map.put("bulidCheckNumCount",bulidCheckNumCount);
1593 1593  
1594 1594 //产检时间的产检人数统计
1595 1595 List<Map<String,String>> checkPersonCounts = mysqlAntexcService.getCheckPersonCount(param1);
1596   - String checkPersonCount ="0";
  1596 + int checkPersonCount = 0;
1597 1597 if (CollectionUtils.isNotEmpty(checkPersonCounts)) {
1598   - checkPersonCount = String.valueOf(checkPersonCounts.get(0).get("checkPersonCount"));
  1598 + checkPersonCount = Integer.valueOf(String.valueOf(checkPersonCounts.get(0).get("checkPersonCount")));
1599 1599 }
1600 1600 map.put("checkPersonCount",checkPersonCount);
1601 1601  
1602   - String matDeliverCount ="0";
  1602 + int matDeliverCount = 0;
1603 1603 List<Map<String,String>> matDeliverCounts = mysqlAntexcService.getMatDeliverCount(param);
1604 1604 if (CollectionUtils.isNotEmpty(matDeliverCounts)) {
1605   - matDeliverCount = String.valueOf(matDeliverCounts.get(0).get("matDeliverCount"));
  1605 + matDeliverCount = Integer.valueOf(String.valueOf(matDeliverCounts.get(0).get("matDeliverCount")));
1606 1606 }
1607 1607 map.put("matDeliverCount",matDeliverCount);
1608 1608  
1609 1609 List<Map<String,String>> liveCounts = mysqlAntexcService.getLiveCount(param);
1610   - String liveCount ="0";
  1610 + int liveCount = 0;
1611 1611 if (CollectionUtils.isNotEmpty(liveCounts)) {
1612   - liveCount = String.valueOf(liveCounts.get(0).get("liveCount"));
  1612 + liveCount = Integer.valueOf(String.valueOf(liveCounts.get(0).get("liveCount")));
1613 1613 }
1614 1614 map.put("liveCount",liveCount);
1615 1615 }
... ... @@ -1623,7 +1623,7 @@
1623 1623 List<Integer> ldNum = new ArrayList<>();
1624 1624  
1625 1625 if (StringUtils.isNotEmpty(hospitalId) || StringUtils.isNotEmpty(areaId)) {
1626   - for (Map<String, String> map : bulidsCount) {
  1626 + for (Map<String, Object> map : bulidsCount) {
1627 1627 chartData.add(map.get("hospitalName").toString());
1628 1628 jdNum.add(getInteger(map.get("buildCount")));
1629 1629 cjNum.add(getInteger(map.get("bulidCheckPersonCount")));
1630 1630  
... ... @@ -1665,14 +1665,14 @@
1665 1665 }
1666 1666  
1667 1667  
1668   - private void getData(List<Map<String, String>> bulidsCount,
  1668 + private void getData(List<Map<String, Object>> bulidsCount,
1669 1669 List<Integer> jdNum, List<Integer> cjNum, List<Integer> cjrcNum,
1670 1670 List<Integer> checkNum, List<Integer> fmNum, List<Integer> ldNum,
1671 1671 List<String> chartData,
1672 1672 String idKey, String nameKey
1673 1673 ) {
1674 1674 Map<String, Integer> result = new LinkedHashMap<>();
1675   - for (Map<String, String> map : bulidsCount) {
  1675 + for (Map<String, Object> map : bulidsCount) {
1676 1676  
1677 1677 String key = "buildCount:" + map.get(idKey).toString() + ":" + map.get(nameKey).toString();
1678 1678 if (result.get(key) != null) {