From e673c0331a40160555e8e2e37ee857f18bde0cb6 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Sat, 14 Aug 2021 15:22:26 +0800 Subject: [PATCH] update --- .../dao/master/MasterMysqlAntexcMapper.java | 5 ++ .../permission/service/MysqlAntexcService.java | 6 ++ .../service/impl/MysqlAntexcServiceImpl.java | 22 ++++++ .../resources/mainOrm/master/MasterMysqlAntexc.xml | 90 ++++++++++++++++++++++ .../operate/web/facade/MatDeliverFacade.java | 49 +++++++----- 5 files changed, 151 insertions(+), 21 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 9c502db..e1cbebd 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 @@ -131,4 +131,9 @@ public interface MasterMysqlAntexcMapper { List> getMatdeliverHivktCheckzqCount(Map param); List> getHasMatdeliverHivktCheckzqCount(Map param); + int getAllFmCount(Map param); + int getAllBuildCount(Map param); + int getNameFmCount(Map param); + int getNameBuildCount(Map param); + int getBuildAndFmCount(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 87b68bb..7e99d52 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 @@ -134,4 +134,10 @@ public interface MysqlAntexcService { List> getMatdeliverHivktCheckCount(Map param); List> getMatdeliverHivktCheckzqCount(Map param); List> getHasMatdeliverHivktCheckzqCount(Map param); + + int getAllFmCount(Map param); + int getAllBuildCount(Map param); + int getNameFmCount(Map param); + int getNameBuildCount(Map param); + int getBuildAndFmCount(Map param); } \ No newline at end of file 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 f03e1ea..75cac95 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 @@ -382,4 +382,26 @@ public class MysqlAntexcServiceImpl implements MysqlAntexcService { public void addRisk(MysqlRisk model) { masterMysqlAntexcMapper.addRisk(model); } + + @Override + public int getAllFmCount(Map param){ + return masterMysqlAntexcMapper.getAllFmCount(param); + } + @Override + public int getAllBuildCount(Map param){ + return masterMysqlAntexcMapper.getAllBuildCount(param); + } + @Override + public int getNameFmCount(Map param){ + return masterMysqlAntexcMapper.getNameFmCount(param); + } + @Override + public int getNameBuildCount(Map param){ + return masterMysqlAntexcMapper.getNameBuildCount(param); + } + @Override + public int getBuildAndFmCount(Map param){ + return masterMysqlAntexcMapper.getBuildAndFmCount(param); + } + } \ No newline at end of file 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 5c686c8..61c0ddb 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml @@ -2576,5 +2576,95 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 24fc731..f7745bc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -25,6 +25,7 @@ import com.lyms.platform.permission.model.OrganizationQuery; import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.model.UsersQuery; import com.lyms.platform.permission.service.CouponService; +import com.lyms.platform.permission.service.MysqlAntexcService; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; @@ -3644,52 +3645,57 @@ public class MatDeliverFacade { return baseResponse; } - public void getFmManageCount() { - } - + @Autowired + private MysqlAntexcService mysqlAntexcService; public BaseObjectResponse getFmManageCount(String time, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); UsersQuery usersQuery = new UsersQuery(); usersQuery.setOrgId(Integer.parseInt(hospitalId)); - usersQuery.setNames(Arrays.asList("刘桂芬", "贾淑平", "付冬华", "宋伟", "俢素英", "李雅玲", "郝艳清", "李彩岩", "魏秀丽")); + usersQuery.setNames(Arrays.asList("刘桂芬", "贾淑平", "付冬华", "宋伟", "俢素英", "李雅玲", "郝艳清", "李彩岩", "魏秀丽","隆化妇幼")); List users = usersService.queryUsers(usersQuery); - - - MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); - matDeliverQuery.setYn(YnEnums.YES.getId()); - matDeliverQuery.setFmHospital(hospitalId); - if (StringUtils.isNotEmpty(time)) + Date startDate = null; + Date endDate = null; + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(time)) { - matDeliverQuery.setCreatedStart(DateUtil.getSNDate(time)[0]); - matDeliverQuery.setEndStart(DateUtil.getSNDate(time)[1]); + String[] arrs = time.split(" - "); + startDate = DateUtil.parseYMD(arrs[0]); + endDate = DateUtil.parseYMD(arrs[1]); } - int allFmCount = matDeliverService.count(matDeliverQuery); + + Map param = new HashMap(); + param.put("startDate",startDate); + param.put("endDate", endDate); + param.put("hospitalId", hospitalId); + + int allFmCount = mysqlAntexcService.getAllFmCount(param); + + List datas = new ArrayList<>(); int fmNameCount = 0; int buildNameCount = 0; - PatientsQuery patientsQuery = new PatientsQuery(); - patientsQuery.setHospitalId(hospitalId); - int allBuildCount = patientsService.queryPatientCount(patientsQuery); + int allBuildCount = mysqlAntexcService.getAllBuildCount(param); for (Users user : users) { Map data = new HashMap(); - matDeliverQuery.setDeliverDoctor(String.valueOf(user.getId())); - int fmCount = matDeliverService.count(matDeliverQuery); + param.put("userId",String.valueOf(user.getId())); + int fmCount = mysqlAntexcService.getNameFmCount(param); fmNameCount+=fmCount; data.put("name",user.getName()); data.put("fmCount", fmCount); - patientsQuery.setBookbuildingDoctor(String.valueOf(user.getId())); - int buildCount = patientsService.queryPatientCount(patientsQuery); + int buildCount = mysqlAntexcService.getNameBuildCount(param); buildNameCount+=buildCount; data.put("buildCount", buildCount); - data.put("buildAndFmCount", 0); + + + int buildAndFmCount = mysqlAntexcService.getBuildAndFmCount(param); + data.put("buildAndFmCount", buildAndFmCount); datas.add(data); } @@ -3699,6 +3705,7 @@ public class MatDeliverFacade { data.put("fmCount",allFmCount - fmNameCount); data.put("buildCount",allBuildCount - buildNameCount); data.put("buildAndFmCount", "-"); + datas.add(data); BaseObjectResponse objectResponse = new BaseObjectResponse(); -- 1.8.3.1