From 605c525559ac39e368334743357f5953529e1f3d Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 19 Jul 2021 16:37:27 +0800 Subject: [PATCH] update --- .../controller/AntenatalExaminationController.java | 14 ++++ .../web/facade/AntenatalExaminationFacade.java | 96 +++++++++++++++++++++- .../operate/web/facade/ResidentsArchiveFacade.java | 2 +- 3 files changed, 109 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java index 428b90d..4e37add 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java @@ -643,4 +643,18 @@ public class AntenatalExaminationController extends BaseController { return antenatalExaminationFacade.getDoctorWxPatientInfo(id); } + + /** + * 免费与收费统计 + * @param checkTime + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/antexCheckCount") + @ResponseBody + public BaseResponse antexCheckCount(@PathVariable String checkTime, HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return antenatalExaminationFacade.antexCheckCount(checkTime,loginState.getId()); + } + } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index fcd9ffb..e5b85a2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -2568,7 +2568,7 @@ public class AntenatalExaminationFacade { private void sortList(List listDate) { //按照数据排序 - Collections.sort(listDate, new Comparator () { + Collections.sort(listDate, new Comparator() { @Override public int compare(SortIn o1, SortIn o2) { if (o1.getDate() != null && null != o2.getDate() && o1.getDate().after(o2.getDate())) { @@ -4809,7 +4809,7 @@ public class AntenatalExaminationFacade { org.springframework.beans.BeanUtils.copyProperties(antExcAddRequest, autoRiskRequest); String fid = antExcAddRequest.getId(); System.out.println("autoExcRisk fid = " + fid); - List > riskList = autoRisk(autoRiskRequest, pat.getHospitalId(), 1); + List> riskList = autoRisk(autoRiskRequest, pat.getHospitalId(), 1); saveAutoRisk(riskList, fid, pat.getHospitalId(), pat.getPid(), pat.getId(), 1); } }); @@ -6343,4 +6343,96 @@ public class AntenatalExaminationFacade { } return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(result); } + + + + public BaseResponse antexCheckCount(String checkTime,Integer userId) { + + + Map data = new HashMap(); + + Date startDate = null; + Date endDate = null; + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(checkTime)) + { + String[] arrs = checkTime.split(" - "); + startDate = DateUtil.getDayFirstSecond(DateUtil.parseYMD(arrs[0])); + endDate = DateUtil.getDayLastSecond(DateUtil.parseYMD(arrs[1])); + } + String hospitalId = autoMatchFacade.getHospitalId(userId); + Criteria criteria = Criteria.where("hospitalId").is(hospitalId).and("xhdb").exists(true); + if (startDate != null) + { + criteria.and("checkTime").gte(startDate).lte(endDate); + } + int xcg = (int)mongoTemplate.count(Query.query(criteria), AntExChuModel.class); + + + Criteria criteria1 = Criteria.where("hospitalId").is(hospitalId).and("ndb").exists(true); + if (startDate != null) + { + criteria1.and("checkTime").gte(startDate).lte(endDate); + } + int ncg = (int)mongoTemplate.count(Query.query(criteria1), AntExChuModel.class); + + + Criteria criteria2 = Criteria.where("hospitalId").is(hospitalId).and("hivkt").exists(true); + if (startDate != null) + { + criteria2.and("checkTime").gte(startDate).lte(endDate); + } + int amy = (int)mongoTemplate.count(Query.query(criteria2), AntExChuModel.class); + + + Criteria criteria3 = Criteria.where("hospitalId").is(hospitalId).and("ygbmky").exists(true); + if (startDate != null) + { + criteria3.and("checkTime").gte(startDate).lte(endDate); + } + int gg = (int)mongoTemplate.count(Query.query(criteria3), AntExChuModel.class); + + + + Criteria criteria4 = Criteria.where("hospitalId").is(hospitalId).and("fTthree").exists(true); + if (startDate != null) + { + criteria4.and("checkTime").gte(startDate).lte(endDate); + } + int jg = (int)mongoTemplate.count(Query.query(criteria4), AntExChuModel.class); + + + + Criteria criteria5 = Criteria.where("hospitalId").is(hospitalId).and("bg").exists(true); + if (startDate != null) + { + criteria5.and("checkTime").gte(startDate).lte(endDate); + } + int bg = (int)mongoTemplate.count(Query.query(criteria5), AntExChuModel.class); + + Criteria criteria6 = Criteria.where("hospitalId").is(hospitalId).and("bChao").exists(true); + if (startDate != null) + { + criteria6.and("checkTime").gte(startDate).lte(endDate); + } + int bc = (int)mongoTemplate.count(Query.query(criteria6), AntExChuModel.class); + + + Criteria criteria7 = Criteria.where("hospitalId").is(hospitalId).and("tx").exists(true); + if (startDate != null) + { + criteria7.and("checkTime").gte(startDate).lte(endDate); + } + int tx = (int)mongoTemplate.count(Query.query(criteria7), AntExChuModel.class); + + data.put("xcg",xcg); + data.put("ncg",ncg); + data.put("amy",amy); + data.put("gg",gg); + data.put("jg",jg); + data.put("bg",bg); + data.put("bc",bc); + data.put("tx",tx); + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(data); + } + } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java index 6bde44a..9516560 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java @@ -1240,7 +1240,7 @@ public class ResidentsArchiveFacade { query.setId(addRequest.getId()); List modelList = residentsArchiveService.queryResident(query); if (CollectionUtils.isNotEmpty(modelList)) { - residentsArchiveService.updateResident(modelList.get(0),modelList.get(0).getId()); + residentsArchiveService.updateResident(addRequest,addRequest.getId()); } else { -- 1.8.3.1