diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CourseService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CourseService.java
index 1729a7b..1fa3e77 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CourseService.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CourseService.java
@@ -36,6 +36,7 @@ public class CourseService {
             courseQuery.mysqlBuild(courseDao.queryCourseListCount(courseQuery.convertToQuery()));
             query.start(courseQuery.getOffset()).end(courseQuery.getLimit());
         }
+
         return courseDao.queryCourseList(query.addOrder(Sort.Direction.DESC, "modified"));
     }
 
diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/CourseModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/CourseModel.java
index 6d7e802..31c7f0a 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/CourseModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/CourseModel.java
@@ -30,6 +30,7 @@ public class CourseModel extends BaseModel {
 
 
     //课程结束时间
+
     private Date courseEndTime;
 
     //时长
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyScreeningController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyScreeningController.java
index 4c17749..794961f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyScreeningController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyScreeningController.java
@@ -89,7 +89,7 @@ public class ApplyScreeningController extends BaseController {
 
     /**
      * 转入、转出孕产妇 -- 转诊通知单打印
-     * @param id
+     * @param
      * @return
      */
     @RequestMapping(method = RequestMethod.GET, value = "/printRe")
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 2997dc9..4fddc98 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
@@ -25,6 +25,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Component;
 
 import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
@@ -103,9 +104,13 @@ public class CourseFacade {
         model.setCourseTypeId(request.getCourseTypeId());
         model.setCourseTime(DateUtil.parseYMDHM(request.getCourseTime()));
 
-        Integer longTime = request.getTimeLong() == null ? 0 : request.getTimeLong()*60*1000;
-
-        model.setCourseEndTime(new Date(DateUtil.parseYMDHM(request.getCourseTime()).getTime() + longTime));
+        //判断CourseEndTime是否为空,如果不为空把前台传过来的值赋给CourseEndTime,前台传过来的是字符串,需要类型转换成Date
+        if(request.getCourseEndTime()!= null) {
+            model.setCourseEndTime(DateUtil.parseYMDHM(request.getCourseEndTime()));
+        }else{
+            Integer longTime = request.getTimeLong() == null ? 0 : request.getTimeLong()*60*1000;
+            model.setCourseEndTime(new Date(DateUtil.parseYMDHM(request.getCourseTime()).getTime() + longTime));
+        }
         model.setTimeLong(request.getTimeLong());
         model.setLimitNum(request.getLimitNum());
         model.setCourseSpeaker(request.getCourseSpeaker());
@@ -217,6 +222,7 @@ public class CourseFacade {
                 result.setStatus(CourseStatusEnums.getNameById(model.getStatus()));
                 result.setCourseRemark(model.getCourseRemark());
                 result.setCourseDesc(model.getCourseDesc());
+                result.setCourseEndTime(DateUtil.gety_m_dhm(model.getCourseEndTime()));
 
                 String createUser = "";
                 Users users = usersService.getUsers(Integer.parseInt(model.getCreateUserId()));
@@ -622,7 +628,7 @@ public class CourseFacade {
         totalData.put("allOrderRate", allSends == 0 ? 0 : df.format((double) allOrders / allSends * 100) + "%"); //总预约率
         totalData.put("allSigns", allSigns);//总签到数
         totalData.put("allSignRate", allOrders == 0 ? 0 : df.format((double) allSigns / allOrders * 100) + "%");//总签到率
-
+        //TODO 孕妇听课率
         CourseTypeQuery courseTypeQuery = new CourseTypeQuery();
         courseTypeQuery.setHospitalId(hospitalId);
         courseTypeQuery.setYn(YnEnums.YES.getId());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CourseRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CourseRequest.java
index dcdc7a8..5197e4f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CourseRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CourseRequest.java
@@ -1,11 +1,12 @@
 package com.lyms.platform.operate.web.request;
 
 
+import java.util.Date;
+
 /**
  * Created by Administrator on 2018-02-05.
  */
 public class CourseRequest {
-
     private String id;
     //课程名称
     private String courseName;
@@ -38,11 +39,20 @@ public class CourseRequest {
     private Integer courseObjId;
 
     private String hospitalId;
+    private String courseEndTime;
 
     public Integer getCourseObjId() {
         return courseObjId;
     }
 
+    public String getCourseEndTime() {
+        return courseEndTime;
+    }
+
+    public void setCourseEndTime(String courseEndTime) {
+        this.courseEndTime = courseEndTime;
+    }
+
     public void setCourseObjId(Integer courseObjId) {
         this.courseObjId = courseObjId;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CourseResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CourseResult.java
index c2cd758..0ed66bf 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CourseResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CourseResult.java
@@ -58,6 +58,15 @@ public class CourseResult {
 
     private Integer courseTypeAvg;
     private Integer courseDocAvg;
+    private String courseEndTime;
+
+    public String getCourseEndTime() {
+        return courseEndTime;
+    }
+
+    public void setCourseEndTime(String courseEndTime) {
+        this.courseEndTime = courseEndTime;
+    }
 
     public String getCourseSpeakerId() {
         return courseSpeakerId;
diff --git a/pom.xml b/pom.xml
index f09b8bf..12d6dd8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -587,7 +587,7 @@
         <dependency>
             <groupId>com.oracle</groupId>
             <artifactId>ojdbc14</artifactId>
-            <version>11.2.0.1.0</version>
+                <version>11.2.0.1.0</version>
         </dependency>
         <dependency>
             <groupId>commons-dbutils</groupId>