jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 4acc7f6216ffe77baed5b6afb1949af9d8584986

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

儿童统计修改

Showing 1 changed file with 41 additions and 15 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 4acc7f6
... ... @@ -4386,42 +4386,56 @@
4386 4386 }
4387 4387  
4388 4388 int baby42 = getCheckMonthCount(hospitalId, startDate, endDate, 0,2);
4389   - datas.add(getMap(baby42, allBaby));
  4389 + int babyrc42 = getCheckMonthCountrc(hospitalId, startDate, endDate, 0, 2);
  4390 + datas.add(getMap(baby42,babyrc42, allBaby));
4390 4391  
4391 4392 int baby3 = getCheckMonthCount(hospitalId, startDate, endDate, 3,4);
4392   - datas.add(getMap(baby3, allBaby));
  4393 + int babyrc3 = getCheckMonthCountrc(hospitalId, startDate, endDate, 3, 4);
  4394 + datas.add(getMap(baby3,babyrc3, allBaby));
4393 4395  
4394 4396 int baby6 = getCheckMonthCount(hospitalId, startDate, endDate, 5,6);
4395   - datas.add(getMap(baby6, allBaby));
  4397 + int babyrc6 = getCheckMonthCountrc(hospitalId, startDate, endDate, 5, 6);
  4398 + datas.add(getMap(baby6, babyrc6,allBaby));
4396 4399  
4397 4400 int baby8 = getCheckMonthCount(hospitalId, startDate, endDate, 7,9);
4398   - datas.add(getMap(baby8,allBaby));
  4401 + int babyrc8 = getCheckMonthCountrc(hospitalId, startDate, endDate, 7, 9);
  4402 + datas.add(getMap(baby8,babyrc8,allBaby));
4399 4403  
4400 4404 int baby12 = getCheckMonthCount(hospitalId, startDate, endDate, 10,14);
4401   - datas.add(getMap(baby12, allBaby));
  4405 + int babyrc12 = getCheckMonthCountrc(hospitalId, startDate, endDate, 10, 14);
  4406 + datas.add(getMap(baby12,babyrc12, allBaby));
4402 4407 int baby18 = getCheckMonthCount(hospitalId, startDate, endDate, 15,20);
4403   - datas.add(getMap(baby18, allBaby));
  4408 + int babyrc18 = getCheckMonthCountrc(hospitalId, startDate, endDate, 15, 20);
  4409 + datas.add(getMap(baby18,babyrc18, allBaby));
4404 4410 int baby24 = getCheckMonthCount(hospitalId, startDate, endDate, 21,28);
4405   - datas.add(getMap(baby24, allBaby));
  4411 + int babyrc24 = getCheckMonthCountrc(hospitalId, startDate, endDate, 21, 28);
  4412 + datas.add(getMap(baby24,babyrc24, allBaby));
4406 4413 int baby30 = getCheckMonthCount(hospitalId, startDate, endDate, 29,34);
4407   - datas.add(getMap(baby30, allBaby));
  4414 + int babyrc30 = getCheckMonthCountrc(hospitalId, startDate, endDate, 29, 34);
  4415 + datas.add(getMap(baby30,babyrc30, allBaby));
4408 4416 int baby36 = getCheckMonthCount(hospitalId, startDate, endDate, 35,38);
4409   - datas.add(getMap(baby36, allBaby));
  4417 + int babyrc36 = getCheckMonthCountrc(hospitalId, startDate, endDate, 35, 38);
  4418 + datas.add(getMap(baby36,babyrc36, allBaby));
4410 4419 int baby40 = getCheckMonthCount(hospitalId, startDate, endDate, 39,48);
4411   - datas.add(getMap(baby40, allBaby));
  4420 + int babyrc40 = getCheckMonthCountrc(hospitalId, startDate, endDate, 39, 48);
  4421 + datas.add(getMap(baby40,babyrc40, allBaby));
4412 4422 int baby50 = getCheckMonthCount(hospitalId, startDate, endDate, 49,65);
4413   - datas.add(getMap(baby50, allBaby));
  4423 + int babyrc50 = getCheckMonthCountrc(hospitalId, startDate, endDate, 49, 65);
  4424 + datas.add(getMap(baby50,babyrc50, allBaby));
4414 4425 int baby60 = getCheckMonthCount(hospitalId, startDate, endDate, 66,1000);
4415   - datas.add(getMap(baby60, allBaby));
  4426 + int babyrc60 = getCheckMonthCountrc(hospitalId, startDate, endDate, 66, 1000);
  4427 + datas.add(getMap(baby60,babyrc60, allBaby));
4416 4428  
4417   - datas.add(getMap(baby42+baby3+baby6+baby8+baby12+baby18+baby24+baby30+baby36+baby40+baby50+baby60, allBaby));
  4429 + datas.add(getMap(baby42+baby3+baby6+baby8+baby12+baby18+baby24+baby30+baby36+baby40+baby50+baby60,
  4430 + babyrc42+babyrc3+babyrc6+babyrc8+babyrc12+babyrc18+babyrc24+babyrc30+babyrc36+babyrc40+babyrc50+babyrc60, allBaby));
4418 4431 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setData(datas).setErrormsg("成功");
4419 4432 }
4420 4433  
4421   - private Map getMap(int num,int total)
  4434 + private Map getMap(int num,int rc,int total)
4422 4435 {
4423 4436 Map data4 = new LinkedHashMap();
4424 4437 data4.put("num",num);
  4438 + data4.put("rc",rc);
4425 4439 data4.put("total",total);
4426 4440 data4.put("percent",getPercent(num,total));
4427 4441 return data4;
4428 4442  
... ... @@ -4449,9 +4463,21 @@
4449 4463 return outputTypeCount4.getMappedResults().size();
4450 4464 }
4451 4465  
  4466 +
  4467 + private int getCheckMonthCountrc(String hospitalId, Date start, Date end,Integer startMonth,Integer endMonth) {
  4468 +
  4469 + Criteria ca = Criteria.where("hospitalId").is(hospitalId).and("checkDate").gte(start).lte(end).and("yn").is(YnEnums.YES.getId());
  4470 + if (startMonth != null)
  4471 + {
  4472 + ca.and("checkMonth").gte(startMonth).lte(endMonth);
  4473 + }
  4474 +
  4475 + return (int)mongoTemplate.count(Query.query(ca),BabyCheckModel.class);
  4476 + }
  4477 +
4452 4478 private int getCheckMonthCount(String hospitalId, Date start, Date end,Integer startMonth,Integer endMonth) {
4453 4479  
4454   - Criteria ca = Criteria.where("hospitalId").is(hospitalId).and("checkDate").gte(start).lte(end);
  4480 + Criteria ca = Criteria.where("hospitalId").is(hospitalId).and("checkDate").gte(start).lte(end).and("yn").is(YnEnums.YES.getId());
4455 4481 if (startMonth != null)
4456 4482 {
4457 4483 ca.and("checkMonth").gte(startMonth).lte(endMonth);