diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java index f6dba02..52a6c28 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java @@ -190,7 +190,7 @@ public class BabyCheckController extends BaseController { @RequestParam(value = "level", required = false) String level, Integer page, Integer limit, HttpServletRequest request) { return babyCheckFacade.babyCheckList(checkTime, queryNo, startCheckMonthAge, endCheckMonthAge, - nextDate, highRisk, waskSon, checkDoctorId, page, limit, getUserId(request),level); + nextDate, highRisk, waskSon, checkDoctorId, page, limit, getUserId(request), level); } /** @@ -550,7 +550,16 @@ public class BabyCheckController extends BaseController { } - + /** + * 儿童年报表统计 + * @param checkTime + * @param hospitalId + * @param provinceId + * @param cityId + * @param areaId + * @param request + * @return + */ @RequestMapping(method = RequestMethod.GET, value = "/getOrgBabyCount") @ResponseBody @TokenRequired @@ -561,7 +570,21 @@ public class BabyCheckController extends BaseController { @RequestParam(required = false) String areaId, HttpServletRequest request) { - return babyCheckFacade.getOrgBabyCount(checkTime,hospitalId,provinceId,cityId,areaId, getUserId(request)); + return babyCheckFacade.getOrgBabyCount(checkTime, hospitalId, provinceId, cityId, areaId, getUserId(request)); } + + /** + *儿童健康管理率统计 + * @param checkTime + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/getBabyManageRateCount") + @ResponseBody + @TokenRequired + public BaseResponse getBabyManageRateCount(@RequestParam(required = false) String checkTime, + HttpServletRequest request) { + return babyCheckFacade.getBabyManageRateCount(checkTime, getUserId(request)); + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index c361425..7c3633e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -4239,4 +4239,35 @@ public class BabyCheckFacade extends BaseServiceImpl { private ThreadPoolTaskExecutor commonThreadPool; @Autowired private MysqlAntexcService mysqlAntexcService; + + + + public BaseResponse getBabyManageRateCount(String checkTime, Integer userId) { + String hospitalId = autoMatchFacade.getHospitalId(userId); + List datas = new LinkedList<>(); + Date startDate = null; + Date endDate = null; + if (StringUtils.isNotEmpty(checkTime)) + { + String[] arrs = checkTime.split(" - "); + startDate = DateUtil.getDayFirstSecond(DateUtil.parseYMD(arrs[0])); + endDate = DateUtil.getDayLastSecond(DateUtil.parseYMD(arrs[1])); + } + + + int allBaby = getCheckCount(hospitalId, startDate,endDate,new ArrayList()); + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setData(datas).setErrormsg("成功"); + } + + + + private int getCheckCount(String hospitalId, Date start, Date end,List checkMonths) { + Aggregation aggregation4 = + Aggregation.newAggregation( + Aggregation.match(Criteria.where("hospitalId").is(hospitalId).and("checkDate").gte(start).lte(end).and("checkMonth").in(checkMonths)), + Aggregation.group("buildId").count().as("总人数")); + AggregationResults outputTypeCount4 = + mongoTemplate.aggregate(aggregation4, "lyms_babycheck", BasicDBObject.class); + return outputTypeCount4.getMappedResults().size(); + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index f4be188..fb47e81 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -2028,6 +2028,8 @@ public class PatientFacade extends BaseServiceImpl { data.put("cardNo", rp.getCardNo()); data.put("vcCardNo", rp.getVcCardNo()); } + data.put("cardNo", rp.getCardNo()); + data.put("addr", rp.getAddr()); data.put("dueWeek", rp.getDueWeek()); data.put("rLevel", getLevel(rp.getrLevel())); data.put("cTimes", rp.getcTimes()); @@ -2047,6 +2049,8 @@ public class PatientFacade extends BaseServiceImpl { cnames.put("cardNo", "身份证"); cnames.put("vcCardNo", "就诊卡号"); } + cnames.put("cardNo", "身份证"); + cnames.put("addr", "居住地址"); cnames.put("dueWeek", "当前孕周"); cnames.put("rLevel", "高危等级"); cnames.put("cTimes", "总产检次数");