From 2f6ffd996093f0b5ea90f398350a1423e7ca5fd3 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 10 Nov 2022 11:06:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=85=B1=E5=8D=AB=E7=94=9F=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/AreaCountController.java | 3 +- .../operate/web/facade/PatientSyncMysqlFacade.java | 56 ++++++++++++++++++++-- 2 files changed, 55 insertions(+), 4 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java index a390ad4..f598931 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java @@ -685,9 +685,10 @@ public class AreaCountController extends BaseController { Integer page, Integer limit, @RequestParam String areaId, @RequestParam( required = false) String streetId, + @RequestParam( required = true) Integer type, //1 本月中医指导人数 2累计中医指导人数 @RequestParam Date dateTime) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return patientSyncMysqlFacade.getBabyZyzdItems(page,limit,areaId,streetId,dateTime); + return patientSyncMysqlFacade.getBabyZyzdItems(page,limit,areaId,streetId,dateTime,type); } } \ No newline at end of file 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 2cee717..5f64795 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 @@ -3073,6 +3073,12 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { int lastDate24= null==mapTotal.get("data24")?0:Integer.parseInt(mapTotal.get("data24").toString()); mapTotal.put("data24",null==streetMap.get("data24")?lastDate24:Integer.parseInt(streetMap.get("data24").toString())+lastDate24); + int lastDate27= null==mapTotal.get("data27")?0:Integer.parseInt(mapTotal.get("data27").toString()); + mapTotal.put("data27",null==streetMap.get("data27")?lastDate27:Integer.parseInt(streetMap.get("data27").toString())+lastDate27); + + int lastDate28= null==mapTotal.get("data28")?0:Integer.parseInt(mapTotal.get("data28").toString()); + mapTotal.put("data28",null==streetMap.get("data28")?lastDate28:Integer.parseInt(streetMap.get("data28").toString())+lastDate28); + data.add(streetMap); } DecimalFormat df = new DecimalFormat("0.00");//格式化小数，不足的补0 @@ -3188,6 +3194,16 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { } mapTotal.put("data25",data23_data24+"%"); + String data27_data28="0.00"; + if(Integer.parseInt(mapTotal.get("data28").toString())!=0){ + float v = (float) Integer.parseInt(mapTotal.get("data27").toString()) / Integer.parseInt(mapTotal.get("data28").toString()); + if(v>=1){ + data27_data28="100.00"; + }else { + data27_data28 = df.format(v * 100); + } + } + mapTotal.put("data29",data27_data28+"%"); data.add(mapTotal); return new BaseObjectResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data); } @@ -3502,6 +3518,29 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { } hospitalDate.put("data25",data23_data24+"%"); + + + checkModelQuery1.setCheckDateStart(startDate); + checkModelQuery1.setCheckDateEnd(endDate); + int data27 =babyCheckService.queryBabyCheckCount(checkModelQuery1); + int lastDate27= null==hospitalDate.get("data27")?0:Integer.parseInt(hospitalDate.get("data27").toString()); + hospitalDate.put("data27",data27+lastDate27); + + checkModelQuery1.setArticleTypes(null); + int data28 =babyCheckService.queryBabyCheckCount(checkModelQuery1); + int lastDate28= null==hospitalDate.get("data28")?0:Integer.parseInt(hospitalDate.get("data28").toString()); + hospitalDate.put("data28",data28+lastDate28); + + String data27_data28="0.00"; + if(Integer.parseInt(hospitalDate.get("data28").toString())!=0){ + float v = (float) Integer.parseInt(hospitalDate.get("data27").toString()) / Integer.parseInt(hospitalDate.get("data28").toString()); + if(v>=1){ + data27_data28="100.00"; + }else { + data27_data28 = df.format(v * 100); + } + } + hospitalDate.put("data29",data27_data28+"%"); } public void getPublicHygieneServiceCountExport(String provinceId, String cityId, String areaId, String streetId, Date dateTime, HttpServletResponse response) { @@ -3543,7 +3582,7 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { ResponseUtil.responseExcel(cnames, results, response); } - public BaseResponse getBabyZyzdItems( Integer page, Integer limit, String areaId, String streetId, Date dateTime) { + public BaseResponse getBabyZyzdItems( Integer page, Integer limit, String areaId, String streetId, Date dateTime,Integer type) { //获得区县下的街道 List regions = getRegions(areaId,streetId); List hospitalIds = new ArrayList<>(); @@ -3570,8 +3609,19 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { checkModelQuery1.setBirthStart(end1); checkModelQuery1.setBirthEnd(start1); checkModelQuery1.setArticleTypes(Arrays.asList(1,2,3,4,5)); - checkModelQuery1.setCheckDateStart(DateUtil.addYear(new Date(),-20)); - checkModelQuery1.setCheckDateEnd(endDate); + + if(type == 1) + { + Date startDate=DateUtil.getDateMonthFirst(dateTime); + checkModelQuery1.setCheckDateStart(startDate); + checkModelQuery1.setCheckDateEnd(endDate); + } + else + { + checkModelQuery1.setCheckDateStart(DateUtil.addYear(new Date(),-20)); + checkModelQuery1.setCheckDateEnd(endDate); + } + checkModelQuery1.setPage(page); checkModelQuery1.setLimit(limit); checkModelQuery1.setNeed("true"); -- 1.8.3.1