jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 129fe7be5de16ecdc2d884bb17eb4650a1dbbb5b

Authored by liquanyu
1 parent 8243f7c594
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

孕妇学校

Showing 4 changed files with 14 additions and 9 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CourseService.java View file @ 129fe7b
... ... @@ -36,7 +36,7 @@
36 36 courseQuery.mysqlBuild(courseDao.queryCourseListCount(courseQuery.convertToQuery()));
37 37 query.start(courseQuery.getOffset()).end(courseQuery.getLimit());
38 38 }
39   - return courseDao.queryCourseList(query.addOrder(Sort.Direction.DESC, "created"));
  39 + return courseDao.queryCourseList(query.addOrder(Sort.Direction.DESC, "modified"));
40 40 }
41 41  
42 42 public void addCourse(CourseModel model) {
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CourseTypeService.java View file @ 129fe7b
... ... @@ -26,7 +26,7 @@
26 26 courseTypeQuery.mysqlBuild(courseTypeDao.queryCourseTypeListCount(courseTypeQuery.convertToQuery()));
27 27 query.start(courseTypeQuery.getOffset()).end(courseTypeQuery.getLimit());
28 28 }
29   - return courseTypeDao.queryCourseTypeList(query.addOrder(Sort.Direction.DESC, "created"));
  29 + return courseTypeDao.queryCourseTypeList(query.addOrder(Sort.Direction.DESC, "modified"));
30 30 }
31 31  
32 32 public void addCourseType(CourseTypeModel model) {
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientCourseService.java View file @ 129fe7b
... ... @@ -26,7 +26,7 @@
26 26 patientCourseQuery.mysqlBuild(patientCourseDao.queryPatientCourseListCount(patientCourseQuery.convertToQuery()));
27 27 query.start(patientCourseQuery.getOffset()).end(patientCourseQuery.getLimit());
28 28 }
29   - return patientCourseDao.queryPatientCourseList(query.addOrder(Sort.Direction.DESC, "created"));
  29 + return patientCourseDao.queryPatientCourseList(query.addOrder(Sort.Direction.DESC, "modified"));
30 30 }
31 31  
32 32 public List<PatientCourseModel> queryPatientCourseList(PatientCourseQuery patientCourseQuery,String sort)
platform-dal/src/main/java/com/lyms/platform/query/CourseQuery.java View file @ 129fe7b
... ... @@ -114,19 +114,24 @@
114 114 condition = condition.and("status", status, MongoOper.IS);
115 115 }
116 116  
117   - if (null != hospitalIds && hospitalIds.size() > 0) {
118   - condition = condition.and("hospitalId", hospitalIds, MongoOper.IN);
119   - }
120   -
121   -
122 117 if (null != courseEndTime) {
123 118 condition = condition.and("courseEndTime", courseEndTime, MongoOper.LTE);
124 119 }
125 120  
126   - if (null != keyword) {
  121 + if (null != keyword && null != hospitalIds && hospitalIds.size() > 0) {
127 122 MongoCondition con1 = MongoCondition.newInstance("courseSpeaker", keyword, MongoOper.LIKE);
128 123 MongoCondition con = MongoCondition.newInstance("courseName", keyword, MongoOper.LIKE);
  124 + MongoCondition condition2 = MongoCondition.newInstance("hospitalId", hospitalIds, MongoOper.IN);
  125 + condition = condition.orCondition(new MongoCondition[]{con1, con,condition2});
  126 + }
  127 + else if (null != keyword)
  128 + {
  129 + MongoCondition con1 = MongoCondition.newInstance("courseSpeaker", keyword, MongoOper.LIKE);
  130 + MongoCondition con = MongoCondition.newInstance("courseName", keyword, MongoOper.LIKE);
129 131 condition = condition.orCondition(new MongoCondition[]{con1, con});
  132 + }
  133 + else if (null != hospitalIds && hospitalIds.size() > 0) {
  134 + condition = condition.and("hospitalId", hospitalIds, MongoOper.IN);
130 135 }
131 136  
132 137 Criteria c1 = null;