From 94d28e52a8ea6503e343489eec07b9c1f75d431c Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 6 Apr 2021 16:19:34 +0800 Subject: [PATCH] update --- .../permission/dao/master/MasterMysqlAntexcMapper.java | 2 +- .../lyms/platform/permission/service/MysqlAntexcService.java | 2 +- .../permission/service/impl/MysqlAntexcServiceImpl.java | 4 ++-- .../src/main/resources/mainOrm/master/MasterMysqlAntexc.xml | 4 ++-- .../platform/operate/web/facade/PatientSyncMysqlFacade.java | 11 +++++++---- 5 files changed, 13 insertions(+), 10 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 4874ffe..971ecbd 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 @@ -76,7 +76,7 @@ public interface MasterMysqlAntexcMapper { List> getBuildCount(Map param); - List> getBulidCheckCount(Map param); + List> getBulidCheckPersonCount(Map param); List> getBulidCheckNumCount(Map param); List> getCheckPersonCount(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 ee903c5..1edf3b3 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 @@ -73,7 +73,7 @@ public interface MysqlAntexcService { List> getBuildCount(Map param); - List> getBulidCheckCount(Map param); + List> getBulidCheckPersonCount(Map param); List> getBulidCheckNumCount(Map param); List> getCheckPersonCount(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 633c78a..40d2e14 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 @@ -169,8 +169,8 @@ public class MysqlAntexcServiceImpl implements MysqlAntexcService { return masterMysqlAntexcMapper.getBuildCount(param); } @Override - public List> getBulidCheckCount(Map param) { - return masterMysqlAntexcMapper.getBulidCheckCount(param); + public List> getBulidCheckPersonCount(Map param) { + return masterMysqlAntexcMapper.getBulidCheckPersonCount(param); } @Override public List> getBulidCheckNumCount(Map 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 abc4e2e..8982580 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml @@ -1311,8 +1311,8 @@ - + select count(tp.patientId) as bulidCheckPersonCount,tp.id as hospitalId,tp.name as hospitalName from (select p.patientId,o.id,o.name from report_patients p INNER JOIN organization o on p.hospitalId=o.id where p.type=1 and p.enable is NULL 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 9d30ede..7ba93e0 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 @@ -1540,7 +1540,7 @@ public class PatientSyncMysqlFacade { param.put("cityId",cityId); param.put("areaId", areaId); List> bulidsCount = mysqlAntexcService.getBuildCount(param); - List> bulidCheckCount = mysqlAntexcService.getBulidCheckCount(param); + List> bulidCheckPersonCounts = mysqlAntexcService.getBulidCheckPersonCount(param); List> bulidCheckNumCounts = mysqlAntexcService.getBulidCheckNumCount(param); List> checkPersonCounts = mysqlAntexcService.getCheckPersonCount(param); List> matDeliverCounts = mysqlAntexcService.getMatDeliverCount(param); @@ -1562,18 +1562,20 @@ public class PatientSyncMysqlFacade { map.put("cityName",cityName); map.put("areaName",areaName); + //建档产检人数 String bulidCheckPersonCount ="0"; - if (CollectionUtils.isNotEmpty(bulidCheckCount)) { - for (Map checkData : bulidCheckCount) { + if (CollectionUtils.isNotEmpty(bulidCheckPersonCounts)) { + for (Map checkData : bulidCheckPersonCounts) { if (hospitalName.equals(checkData.get("hospitalName"))) { - bulidCheckPersonCount = String.valueOf(checkData.get("checkPersonCount")); + bulidCheckPersonCount = String.valueOf(checkData.get("bulidCheckPersonCount")); break; } } } map.put("bulidCheckPersonCount",bulidCheckPersonCount); + //建档产检人次统计 String bulidCheckNumCount ="0"; if (CollectionUtils.isNotEmpty(bulidCheckNumCounts)) { for (Map checkData : bulidCheckNumCounts) { @@ -1586,6 +1588,7 @@ public class PatientSyncMysqlFacade { } map.put("bulidCheckNumCount",bulidCheckNumCount); + //产检时间的产检人数统计 String checkPersonCount ="0"; if (CollectionUtils.isNotEmpty(checkPersonCounts)) { for (Map checkData : checkPersonCounts) { -- 1.8.3.1