diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientCourseQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientCourseQuery.java
index d6b11d0..e68b7f3 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/PatientCourseQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientCourseQuery.java
@@ -138,21 +138,21 @@ public class PatientCourseQuery extends BaseQuery implements IConvertToNativeQue
         }
 
 
-//        if (null != createdStart) {
-//            if (null != c1) {
-//                c1 = c1.and("created").gte(createdStart);
-//            } else {
-//                c1 = Criteria.where("created").gte(createdStart);
-//            }
-//        }
-//
-//        if (null != createdEnd) {
-//            if (null != c1) {
-//                c1 = c1.lte(createdEnd);
-//            } else {
-//                c1 = Criteria.where("created").lte(createdEnd);
-//            }
-//        }
+        if (null != createdStart) {
+            if (null != c1) {
+                c1 = c1.and("created").gte(createdStart);
+            } else {
+                c1 = Criteria.where("created").gte(createdStart);
+            }
+        }
+
+        if (null != createdEnd) {
+            if (null != c1) {
+                c1 = c1.lte(createdEnd);
+            } else {
+                c1 = Criteria.where("created").lte(createdEnd);
+            }
+        }
 
 
         if (null != c1) {
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 9d7d0ba..c902f22 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
@@ -366,13 +366,16 @@ public class CourseFacade {
         query.setYn(YnEnums.YES.getId());
         query.setHospitalId(hospitalId);
 
-        int allCourses  = courseService.queryCourseCount(query);
         int allSends  = 0; //TODO
 
-
         PatientCourseQuery patientCourseQuery = new PatientCourseQuery();
         patientCourseQuery.setYn(YnEnums.YES.getId());
         patientCourseQuery.setHospitalId(hospitalId);
+
+        int allCourses  =  courseService.queryCourseCount(query);
+
+        int allPatientCourses  =  patientCourseService.queryPatientCourseCount(patientCourseQuery);
+
         //状态 1预约，2签到
         patientCourseQuery.setStatus(1);
 
@@ -388,25 +391,23 @@ public class CourseFacade {
         resultData.put("allCourses",allCourses); //课程数
         resultData.put("allSends",allSends); //总推送数
         resultData.put("allOrders",allOrders); //总预约数
-        resultData.put("allOrderRate",allCourses == 0 ? 0 : df.format((double) allOrders / allCourses * 100) + "%"); //总预约率
+        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 / allCourses * 100) + "%");//总签到率
+        resultData.put("allSignRate",allCourses == 0 ? 0 :  df.format((double) allSigns / allPatientCourses * 100) + "%");//总签到率
 
+        CourseTypeQuery courseTypeQuery = new CourseTypeQuery();
+        courseTypeQuery.setHospitalId(hospitalId);
+        courseTypeQuery.setYn(YnEnums.YES.getId());
 
         if (StringUtils.isNotEmpty(time)) {
             String[] dates = time.split(" - ");
-            query.setCreatedStart(DateUtil.parseYMD(dates[0]));
+            patientCourseQuery.setCreatedStart(DateUtil.parseYMD(dates[0]));
             if (dates.length == 2) {
-                query.setCreatedEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59"));
+                patientCourseQuery.setCreatedEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59"));
             }
         }
 
-        allCourses  = courseService.queryCourseCount(query);
-
-
-        CourseTypeQuery courseTypeQuery = new CourseTypeQuery();
-        courseTypeQuery.setHospitalId(hospitalId);
-        courseTypeQuery.setYn(YnEnums.YES.getId());
+        allPatientCourses  =  patientCourseService.queryPatientCourseCount(patientCourseQuery);
 
         List<Map> tableData = new ArrayList<>();
 
@@ -445,9 +446,9 @@ public class CourseFacade {
 
                 tableMap.put("sends",0);//TODO
                 tableMap.put("orders",courseOrders);
-                tableMap.put("ordersRate",allCourses == 0 ? "0" : df.format((double) courseOrders / allCourses * 100) + "%");
+                tableMap.put("ordersRate",allCourses == 0 ? "0" : df.format((double) courseOrders / allPatientCourses * 100) + "%");
                 tableMap.put("signs",courseSigns);
-                tableMap.put("signsRate",allCourses == 0 ? "0" : df.format((double) courseSigns / allCourses * 100) + "%");
+                tableMap.put("signsRate",allCourses == 0 ? "0" : df.format((double) courseSigns / allPatientCourses * 100) + "%");
                 tableData.add(tableMap);
             }