shiyang / regional-platform

Download as
Browse Code »

Commit 4d3f9864e1460b525f02502925c9a6a28ed34c6b

Authored by hujiaqi
1 parent 140dba5e92
Exists in master and in 1 other branch nobuildprocess

修改查询医院方式

Showing 1 changed file with 5 additions and 4 deletions

platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ 4d3f986
... ... @@ -726,12 +726,14 @@
726 726 if (buildTypeEq != null) {
727 727 condition = condition.and("buildType", buildTypeEq, MongoOper.IS);
728 728 }
  729 + Criteria c1 = null;
729 730 if (lastCheckEmployeeId != null) {
730 731 condition = condition.and("lastCheckEmployeeId", lastCheckEmployeeId, MongoOper.IS);
731 732 }
732 733 else if(lastCheckEId){
733   - condition = condition.and("lastCheckEmployeeId", "", MongoOper.NE);
734   - condition = condition.andCondition(MongoCondition.newInstance("lastCheckEmployeeId", null, MongoOper.NE));
  734 + // condition = condition.and("lastCheckEmployeeId", "", MongoOper.NE);
  735 + // condition = condition.andCondition(MongoCondition.newInstance("lastCheckEmployeeId", null, MongoOper.NE));
  736 + c1 = Criteria.where("lastCheckEmployeeId").ne("").ne(null);
735 737 }
736 738 if (bookbuildingDoctor != null) {
737 739 condition = condition.and("bookbuildingDoctor", bookbuildingDoctor, MongoOper.IS);
738 740  
... ... @@ -805,14 +807,13 @@
805 807 }
806 808 if(CollectionUtils.isNotEmpty(hospitalList)){
807 809 condition = condition.and("hospitalId", hospitalList, MongoOper.IN);
808   - }else
  810 + }
809 811 if (null != hospitalId) {
810 812 condition = condition.and("hospitalId", hospitalId, MongoOper.IS);
811 813 }
812 814 if (null != pid) {
813 815 condition = condition.and("pid", pid, MongoOper.IS);
814 816 }
815   - Criteria c1 = null;
816 817 if (null != queryNo) {
817 818 MongoCondition c = MongoCondition.newInstance();
818 819 MongoCondition con1 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS);