jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 2f6ffd996093f0b5ea90f398350a1423e7ca5fd3

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

公共卫生统计

Showing 2 changed files with 55 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java View file @ 2f6ffd9
... ... @@ -685,9 +685,10 @@
685 685 Integer page, Integer limit,
686 686 @RequestParam String areaId,
687 687 @RequestParam( required = false) String streetId,
  688 + @RequestParam( required = true) Integer type, //1 本月中医指导人数 2累计中医指导人数
688 689 @RequestParam Date dateTime) {
689 690 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
690   - return patientSyncMysqlFacade.getBabyZyzdItems(page,limit,areaId,streetId,dateTime);
  691 + return patientSyncMysqlFacade.getBabyZyzdItems(page,limit,areaId,streetId,dateTime,type);
691 692 }
692 693  
693 694 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java View file @ 2f6ffd9
... ... @@ -3073,6 +3073,12 @@
3073 3073 int lastDate24= null==mapTotal.get("data24")?0:Integer.parseInt(mapTotal.get("data24").toString());
3074 3074 mapTotal.put("data24",null==streetMap.get("data24")?lastDate24:Integer.parseInt(streetMap.get("data24").toString())+lastDate24);
3075 3075  
  3076 + int lastDate27= null==mapTotal.get("data27")?0:Integer.parseInt(mapTotal.get("data27").toString());
  3077 + mapTotal.put("data27",null==streetMap.get("data27")?lastDate27:Integer.parseInt(streetMap.get("data27").toString())+lastDate27);
  3078 +
  3079 + int lastDate28= null==mapTotal.get("data28")?0:Integer.parseInt(mapTotal.get("data28").toString());
  3080 + mapTotal.put("data28",null==streetMap.get("data28")?lastDate28:Integer.parseInt(streetMap.get("data28").toString())+lastDate28);
  3081 +
3076 3082 data.add(streetMap);
3077 3083 }
3078 3084 DecimalFormat df = new DecimalFormat("0.00");//格式化小数，不足的补0
... ... @@ -3188,6 +3194,16 @@
3188 3194 }
3189 3195 mapTotal.put("data25",data23_data24+"%");
3190 3196  
  3197 + String data27_data28="0.00";
  3198 + if(Integer.parseInt(mapTotal.get("data28").toString())!=0){
  3199 + float v = (float) Integer.parseInt(mapTotal.get("data27").toString()) / Integer.parseInt(mapTotal.get("data28").toString());
  3200 + if(v>=1){
  3201 + data27_data28="100.00";
  3202 + }else {
  3203 + data27_data28 = df.format(v * 100);
  3204 + }
  3205 + }
  3206 + mapTotal.put("data29",data27_data28+"%");
3191 3207 data.add(mapTotal);
3192 3208 return new BaseObjectResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data);
3193 3209 }
... ... @@ -3502,6 +3518,29 @@
3502 3518 }
3503 3519 hospitalDate.put("data25",data23_data24+"%");
3504 3520  
  3521 +
  3522 +
  3523 + checkModelQuery1.setCheckDateStart(startDate);
  3524 + checkModelQuery1.setCheckDateEnd(endDate);
  3525 + int data27 =babyCheckService.queryBabyCheckCount(checkModelQuery1);
  3526 + int lastDate27= null==hospitalDate.get("data27")?0:Integer.parseInt(hospitalDate.get("data27").toString());
  3527 + hospitalDate.put("data27",data27+lastDate27);
  3528 +
  3529 + checkModelQuery1.setArticleTypes(null);
  3530 + int data28 =babyCheckService.queryBabyCheckCount(checkModelQuery1);
  3531 + int lastDate28= null==hospitalDate.get("data28")?0:Integer.parseInt(hospitalDate.get("data28").toString());
  3532 + hospitalDate.put("data28",data28+lastDate28);
  3533 +
  3534 + String data27_data28="0.00";
  3535 + if(Integer.parseInt(hospitalDate.get("data28").toString())!=0){
  3536 + float v = (float) Integer.parseInt(hospitalDate.get("data27").toString()) / Integer.parseInt(hospitalDate.get("data28").toString());
  3537 + if(v>=1){
  3538 + data27_data28="100.00";
  3539 + }else {
  3540 + data27_data28 = df.format(v * 100);
  3541 + }
  3542 + }
  3543 + hospitalDate.put("data29",data27_data28+"%");
3505 3544 }
3506 3545  
3507 3546 public void getPublicHygieneServiceCountExport(String provinceId, String cityId, String areaId, String streetId, Date dateTime, HttpServletResponse response) {
... ... @@ -3543,7 +3582,7 @@
3543 3582 ResponseUtil.responseExcel(cnames, results, response);
3544 3583 }
3545 3584  
3546   - public BaseResponse getBabyZyzdItems( Integer page, Integer limit, String areaId, String streetId, Date dateTime) {
  3585 + public BaseResponse getBabyZyzdItems( Integer page, Integer limit, String areaId, String streetId, Date dateTime,Integer type) {
3547 3586 //获得区县下的街道
3548 3587 List<BasicConfig> regions = getRegions(areaId,streetId);
3549 3588 List<String> hospitalIds = new ArrayList<>();
... ... @@ -3570,8 +3609,19 @@
3570 3609 checkModelQuery1.setBirthStart(end1);
3571 3610 checkModelQuery1.setBirthEnd(start1);
3572 3611 checkModelQuery1.setArticleTypes(Arrays.asList(1,2,3,4,5));
3573   - checkModelQuery1.setCheckDateStart(DateUtil.addYear(new Date(),-20));
3574   - checkModelQuery1.setCheckDateEnd(endDate);
  3612 +
  3613 + if(type == 1)
  3614 + {
  3615 + Date startDate=DateUtil.getDateMonthFirst(dateTime);
  3616 + checkModelQuery1.setCheckDateStart(startDate);
  3617 + checkModelQuery1.setCheckDateEnd(endDate);
  3618 + }
  3619 + else
  3620 + {
  3621 + checkModelQuery1.setCheckDateStart(DateUtil.addYear(new Date(),-20));
  3622 + checkModelQuery1.setCheckDateEnd(endDate);
  3623 + }
  3624 +
3575 3625 checkModelQuery1.setPage(page);
3576 3626 checkModelQuery1.setLimit(limit);
3577 3627 checkModelQuery1.setNeed("true");