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 5846da6..82696b0 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 @@ -406,12 +406,12 @@ public class CourseFacade { DecimalFormat df = new DecimalFormat("0.00"); - resultData.put("allCourses",allCourses); //课程数 - resultData.put("allSends",allSends); //总推送数 - resultData.put("allOrders",allOrders); //总预约数 - resultData.put("allOrderRate", allCourses == 0 ? 0 : df.format((double) allOrders / allPatientCourses * 100) + "%"); //总预约率 - resultData.put("allSigns", allSigns);//总签到数 - resultData.put("allSignRate", allCourses == 0 ? 0 : df.format((double) allSigns / allPatientCourses * 100) + "%");//总签到率 + totalData.put("allCourses",allCourses); //课程数 + totalData.put("allSends",allSends); //总推送数 + totalData.put("allOrders",allOrders); //总预约数 + totalData.put("allOrderRate", allCourses == 0 ? 0 : df.format((double) allOrders / allPatientCourses * 100) + "%"); //总预约率 + totalData.put("allSigns", allSigns);//总签到数 + totalData.put("allSignRate", allCourses == 0 ? 0 : df.format((double) allSigns / allPatientCourses * 100) + "%");//总签到率 CourseTypeQuery courseTypeQuery = new CourseTypeQuery(); courseTypeQuery.setHospitalId(hospitalId); @@ -432,6 +432,9 @@ public class CourseFacade { allPatientCourses = patientCourseService.queryPatientCourseCount(patientCourseQuery); } + + + List courseModelList = courseService.queryCourseList(query); if (CollectionUtils.isNotEmpty(courseModelList)) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CourseCountWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CourseCountWorker.java new file mode 100644 index 0000000..5c8d73a --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CourseCountWorker.java @@ -0,0 +1,88 @@ +package com.lyms.platform.operate.web.worker; + +import com.lyms.platform.common.enums.SmsServiceEnums; +import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.pojo.CourseModel; +import com.lyms.platform.pojo.CourseTypeModel; +import com.lyms.platform.query.CourseTypeQuery; +import com.lyms.platform.query.PatientCourseQuery; +import org.apache.commons.collections.CollectionUtils; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.Callable; + +/** + * Created by Administrator on 2018-04-20. + */ +public class CourseCountWorker implements Callable { + + public CourseCountWorker() + { + + } + + @Override + public Map call() throws Exception { + Map chartData = new HashMap(); +// if (CollectionUtils.isNotEmpty(courseModelList)) +// { +// +// CourseTypeQuery courseTypeQuery = new CourseTypeQuery(); +// courseTypeQuery.setHospitalId(hospitalId); +// courseTypeQuery.setYn(YnEnums.YES.getId()); +// +// +// PatientCourseQuery patientCourseQuery = new PatientCourseQuery(); +// patientCourseQuery.setYn(YnEnums.YES.getId()); +// patientCourseQuery.setHospitalId(hospitalId); +// +// List titles = new ArrayList(); +// List sends = new ArrayList(); +// List orders = new ArrayList(); +// List signs = new ArrayList(); +// for (CourseModel courseModel : courseModelList) +// { +// patientCourseQuery.setCourseId(courseModel.getId()); +// titles.add(courseModel.getCourseName()); +// +// patientCourseQuery.setStatus(1); +// int courseOrders = patientCourseService.queryPatientCourseCount(patientCourseQuery); +// orders.add(courseOrders); +// +// patientCourseQuery.setStatus(2); +// int courseSigns = patientCourseService.queryPatientCourseCount(patientCourseQuery); +// signs.add(courseSigns); +// +// int courseSends = getCourseCountData(hospitalId, String.valueOf(SmsServiceEnums.YFXXKCTX.getId()), 3, +// 1,courseModel.getId(), start, end); +// sends.add(courseSends); +// +// courseTypeQuery.setId(courseModel.getCourseTypeId()); +// List typeModels = courseTypeService.queryCourseTypeList(courseTypeQuery); +// +// Map tableMap = new HashMap(); +// +// tableMap.put("courseTypeId",CollectionUtils.isNotEmpty(typeModels) ? typeModels.get(0).getId() : ""); +// tableMap.put("courseTypeName",CollectionUtils.isNotEmpty(typeModels) ? typeModels.get(0).getCourseTypeName() : ""); +// tableMap.put("courseName",courseModel.getCourseName()); +// +// tableMap.put("sends",courseSends); +// tableMap.put("orders",courseOrders); +// tableMap.put("ordersRate",allPatientCourses == 0 ? "0" : df.format((double) courseOrders / allPatientCourses * 100) + "%"); +// tableMap.put("signs",courseSigns); +// tableMap.put("signsRate",allPatientCourses == 0 ? "0" : df.format((double) courseSigns / allPatientCourses * 100) + "%"); +// tableData.add(tableMap); +// } +// +// chartData.put("titles",titles); +// chartData.put("sends",sends); +// chartData.put("orders",orders); +// chartData.put("signs",signs); +// } + + return chartData; + } +}