liquanyu / regional-platform

Download as
Browse Code »

Commit bf9c0970a0247c996c19647a186c7ddad448d3fe

Authored by yangfei
2 parents ab7fdf205a a0250fb083
Exists in master and in 1 other branch dev

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientCourseController.java View file @ bf9c097
... ... @@ -27,7 +27,7 @@
27 27 * @param request
28 28 * @return
29 29 */
30   - @RequestMapping(method = RequestMethod.POST, value = "/getOrderPatientCourseList")
  30 + @RequestMapping(method = RequestMethod.GET, value = "/getOrderPatientCourseList")
31 31 @ResponseBody
32 32 @TokenRequired
33 33 public BaseResponse getOrderPatientCourseList(@RequestParam(required = false) String courseId,
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java View file @ bf9c097
... ... @@ -146,13 +146,14 @@
146 146 result.setId(model.getId());
147 147  
148 148 String courseType = "";
149   - query.setId(model.getCourseTypeId());
  149 + courseTypeQuery.setId(model.getCourseTypeId());
150 150 List<CourseTypeModel> typeModels = courseTypeService.queryCourseTypeList(courseTypeQuery);
151 151 if (CollectionUtils.isNotEmpty(typeModels))
152 152 {
153 153 courseType = typeModels.get(0).getCourseTypeName();
154 154 }
155 155 result.setCourseType(courseType);
  156 + result.setCourseTypeId(model.getCourseTypeId());
156 157  
157 158 result.setCourseName(model.getCourseName());
158 159 result.setCourseSpeaker(model.getCourseSpeaker());
... ... @@ -163,6 +164,8 @@
163 164 result.setEnrolmentNum(model.getEnrolmentNum());
164 165 result.setSignNum(model.getSignNum());
165 166 result.setStatus(CourseStatusEnums.getNameById(model.getStatus()));
  167 + result.setCourseRemark(model.getCourseRemark());
  168 + result.setCourseDesc(model.getCourseDesc());
166 169  
167 170 String createUser = "";
168 171 Users users = usersService.getUsers(Integer.parseInt(model.getCreateUserId()));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CourseResult.java View file @ bf9c097
... ... @@ -41,12 +41,20 @@
41 41  
42 42 //课程类别
43 43 private String courseType;
  44 + private String courseTypeId;
44 45  
45 46 //创建人id
46 47 private String createUser;
47 48  
48 49 private String created;
49 50  
  51 + public String getCourseTypeId() {
  52 + return courseTypeId;
  53 + }
  54 +
  55 + public void setCourseTypeId(String courseTypeId) {
  56 + this.courseTypeId = courseTypeId;
  57 + }
50 58  
51 59 public String getId() {
52 60 return id;