From 129fe7be5de16ecdc2d884bb17eb4650a1dbbb5b Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 12 Mar 2018 15:53:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=A6=87=E5=AD=A6=E6=A0=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/biz/service/CourseService.java | 2 +- .../lyms/platform/biz/service/CourseTypeService.java | 2 +- .../lyms/platform/biz/service/PatientCourseService.java | 2 +- .../main/java/com/lyms/platform/query/CourseQuery.java | 17 +++++++++++------ 4 files changed, 14 insertions(+), 9 deletions(-) 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 06a80bc..8f1e3e1 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,7 +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, "created")); + return courseDao.queryCourseList(query.addOrder(Sort.Direction.DESC, "modified")); } public void addCourse(CourseModel model) { diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CourseTypeService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CourseTypeService.java index 8007d5b..c83bf8a 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CourseTypeService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CourseTypeService.java @@ -26,7 +26,7 @@ public class CourseTypeService { courseTypeQuery.mysqlBuild(courseTypeDao.queryCourseTypeListCount(courseTypeQuery.convertToQuery())); query.start(courseTypeQuery.getOffset()).end(courseTypeQuery.getLimit()); } - return courseTypeDao.queryCourseTypeList(query.addOrder(Sort.Direction.DESC, "created")); + return courseTypeDao.queryCourseTypeList(query.addOrder(Sort.Direction.DESC, "modified")); } public void addCourseType(CourseTypeModel model) { diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientCourseService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientCourseService.java index aa29a36..e757b8d 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientCourseService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientCourseService.java @@ -26,7 +26,7 @@ public class PatientCourseService { patientCourseQuery.mysqlBuild(patientCourseDao.queryPatientCourseListCount(patientCourseQuery.convertToQuery())); query.start(patientCourseQuery.getOffset()).end(patientCourseQuery.getLimit()); } - return patientCourseDao.queryPatientCourseList(query.addOrder(Sort.Direction.DESC, "created")); + return patientCourseDao.queryPatientCourseList(query.addOrder(Sort.Direction.DESC, "modified")); } public List queryPatientCourseList(PatientCourseQuery patientCourseQuery,String sort) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/CourseQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/CourseQuery.java index 5b4b8b0..4f0a0c6 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/CourseQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/CourseQuery.java @@ -114,20 +114,25 @@ public class CourseQuery extends BaseQuery implements IConvertToNativeQuery { condition = condition.and("status", status, MongoOper.IS); } - if (null != hospitalIds && hospitalIds.size() > 0) { - condition = condition.and("hospitalId", hospitalIds, MongoOper.IN); - } - - if (null != courseEndTime) { condition = condition.and("courseEndTime", courseEndTime, MongoOper.LTE); } - if (null != keyword) { + if (null != keyword && null != hospitalIds && hospitalIds.size() > 0) { + MongoCondition con1 = MongoCondition.newInstance("courseSpeaker", keyword, MongoOper.LIKE); + MongoCondition con = MongoCondition.newInstance("courseName", keyword, MongoOper.LIKE); + MongoCondition condition2 = MongoCondition.newInstance("hospitalId", hospitalIds, MongoOper.IN); + condition = condition.orCondition(new MongoCondition[]{con1, con,condition2}); + } + else if (null != keyword) + { MongoCondition con1 = MongoCondition.newInstance("courseSpeaker", keyword, MongoOper.LIKE); MongoCondition con = MongoCondition.newInstance("courseName", keyword, MongoOper.LIKE); condition = condition.orCondition(new MongoCondition[]{con1, con}); } + else if (null != hospitalIds && hospitalIds.size() > 0) { + condition = condition.and("hospitalId", hospitalIds, MongoOper.IN); + } Criteria c1 = null; -- 1.8.3.1