From d66ae93f2903db4a1ef8e1c432153c0df8746ead Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 20 Apr 2018 10:13:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=A6=87=E5=AD=A6=E6=A0=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/CourseController.java | 2 +- .../platform/operate/web/facade/CourseFacade.java | 22 +++++++++++++--------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseController.java index 61951e4..5d76bb6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseController.java @@ -171,7 +171,7 @@ public class CourseController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = "/getCourseCount") @ResponseBody @TokenRequired - public BaseResponse getCourseCount(HttpServletRequest request, @RequestParam(required = true) String time) { + public BaseResponse getCourseCount(HttpServletRequest request, @RequestParam(required = false) String time) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); return courseFacade.getCourseCount(time,loginState.getId()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java index d177b84..5846da6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java @@ -368,14 +368,23 @@ public class CourseFacade { public BaseResponse getCourseCount(String time, Integer userId) { BaseObjectResponse objectResponse = new BaseObjectResponse(); String hospitalId = autoMatchFacade.getHospitalId(userId); + Map resultData = new HashMap(); Map totalData = new HashMap(); + List tableData = new ArrayList<>(); + Map chartData = new HashMap(); + CourseQuery query = new CourseQuery(); query.setYn(YnEnums.YES.getId()); query.setHospitalId(hospitalId); + //课程总数 + int allCourses = courseService.queryCourseCount(query); + + + //总推送数 int allSends = getCourseCountData(hospitalId, String.valueOf(SmsServiceEnums.YFXXKCTX.getId()), 3, 1,null, null, null); @@ -383,18 +392,16 @@ public class CourseFacade { patientCourseQuery.setYn(YnEnums.YES.getId()); patientCourseQuery.setHospitalId(hospitalId); - int allCourses = courseService.queryCourseCount(query); int allPatientCourses = patientCourseService.queryPatientCourseCount(patientCourseQuery); //状态 1预约，2签到 patientCourseQuery.setStatus(1); - + //总预约数 int allOrders = patientCourseService.queryPatientCourseCount(patientCourseQuery); patientCourseQuery.setStatus(2); - - + //总签到数 int allSigns = patientCourseService.queryPatientCourseCount(patientCourseQuery); DecimalFormat df = new DecimalFormat("0.00"); @@ -421,13 +428,10 @@ public class CourseFacade { end = dates[1]; patientCourseQuery.setCreatedEnd(DateUtil.parseYMDHMS(end + " 23:59:59")); } - } - allPatientCourses = patientCourseService.queryPatientCourseCount(patientCourseQuery); - - List tableData = new ArrayList<>(); + allPatientCourses = patientCourseService.queryPatientCourseCount(patientCourseQuery); + } - Map chartData = new HashMap(); List courseModelList = courseService.queryCourseList(query); if (CollectionUtils.isNotEmpty(courseModelList)) { -- 1.8.3.1