From f78bacdda00ba9d8be37062008e036c9f18e9386 Mon Sep 17 00:00:00 2001 From: hujiaqi Date: Wed, 4 Jan 2017 14:04:17 +0800 Subject: [PATCH] bug --- .../com/lyms/platform/query/PatientsQuery.java | 30 ++++++++++++++++++---- .../platform/operate/web/facade/PatientFacade.java | 27 ++++++++++--------- 2 files changed, 38 insertions(+), 19 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index 3e5e28e..0e1480d 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -959,14 +959,22 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { MongoCondition con2 = MongoCondition.newInstance("username", queryNo, MongoOper.IS); MongoCondition con3 = MongoCondition.newInstance("cardNo", queryNo, MongoOper.IS); MongoCondition con4 = MongoCondition.newInstance("fileCode", queryNo, MongoOper.IS); - c1= c.orCondition(new MongoCondition[]{con1, con2, con3,con4}).getCriteria(); + if(c1!=null) { + c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2, con3, con4}).getCriteria()); + }else { + c1 = c.orCondition(new MongoCondition[]{con1, con2, con3, con4}).getCriteria(); + } } if (CollectionUtils.isNotEmpty(fmHospitalQueryList)) { MongoCondition c = MongoCondition.newInstance(); MongoCondition con1 = MongoCondition.newInstance("hospitalId", fmHospitalQueryList, MongoOper.IN); MongoCondition con2 = MongoCondition.newInstance("fmHospital", fmHospitalQueryList, MongoOper.IN); - c1= c.orCondition(new MongoCondition[]{con1, con2}).getCriteria(); + if(c1!=null) { + c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2}).getCriteria()); + }else{ + c1 = c.orCondition(new MongoCondition[]{con1, con2}).getCriteria(); + } } if (lastCheckEmployeeId != null) { @@ -975,11 +983,19 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { else if(lastCheckEId){ condition = condition.and("lastCheckEmployeeId", "", MongoOper.NE); MongoCondition c = MongoCondition.newInstance(); - c1= c.andCondition(MongoCondition.newInstance("lastCheckEmployeeId", null, MongoOper.NE)).getCriteria(); + if(c1!=null){ + c1= c1.andOperator(c.andCondition(MongoCondition.newInstance("lastCheckEmployeeId", null, MongoOper.NE)).getCriteria()); + }else { + c1 = c.andCondition(MongoCondition.newInstance("lastCheckEmployeeId", null, MongoOper.NE)).getCriteria(); + } } if (fmDateStart != null && fmDateEnd != null) { - c1 = Criteria.where("fmDate").gte(fmDateStart).lte(fmDateEnd); + if(c1!=null){ + c1 = c1.and("fmDate").gte(fmDateStart).lte(fmDateEnd); + }else { + c1 = Criteria.where("fmDate").gte(fmDateStart).lte(fmDateEnd); + } } if (null != serviceType) { @@ -1016,7 +1032,11 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { else if(norFactor){ condition = condition.and("riskFactorId", new ArrayList(), MongoOper.NE); MongoCondition c = MongoCondition.newInstance(); - c1= c.andCondition(MongoCondition.newInstance("riskFactorId", null, MongoOper.NE)).getCriteria(); + if(c1!=null){ + c1 = c1.andOperator(c.andCondition(MongoCondition.newInstance("riskFactorId", null, MongoOper.NE)).getCriteria()); + }else { + c1 = c.andCondition(MongoCondition.newInstance("riskFactorId", null, MongoOper.NE)).getCriteria(); + } } if (-1 != yn) { condition = condition.and("yn", yn, MongoOper.IS); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 69815f6..ac89e4b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -16,8 +16,6 @@ import com.lyms.platform.operate.web.worker.QuanPatientWorker; import com.lyms.platform.operate.web.worker.WorkHR; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.OrganizationQuery; -import com.lyms.platform.permission.model.Users; -import com.lyms.platform.permission.model.UsersQuery; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; @@ -774,17 +772,18 @@ public class PatientFacade { patientsQuery.setProvinceRegisterId(StringUtils.isEmpty(patientManagerRequest.getProvinceRegisterId()) ? null : patientManagerRequest.getProvinceRegisterId()); patientsQuery.setCityRegisterId(StringUtils.isEmpty(patientManagerRequest.getCityRegisterId()) ? null : patientManagerRequest.getCityRegisterId()); patientsQuery.setAreaRegisterId(StringUtils.isEmpty(patientManagerRequest.getAreaRegisterId()) ? null : patientManagerRequest.getAreaRegisterId()); - UsersQuery usersQuery = new UsersQuery(); - usersQuery.setName(patientManagerRequest.getBookbuildingDoctor()); - usersQuery.setYn(YnEnums.YES.getId()); - List usersList = usersService.queryUsers(usersQuery); - if (CollectionUtils.isNotEmpty(usersList)) { - List bookbuildingDoctorList = new ArrayList<>(); - for (Users users : usersList) { - bookbuildingDoctorList.add(users.getId().toString()); - } - patientsQuery.setBookbuildingDoctorList(bookbuildingDoctorList); - } + // UsersQuery usersQuery = new UsersQuery(); + // usersQuery.setName(patientManagerRequest.getBookbuildingDoctor()); + // usersQuery.setYn(YnEnums.YES.getId()); + // List usersList = usersService.queryUsers(usersQuery); + // if (CollectionUtils.isNotEmpty(usersList)) { + // List bookbuildingDoctorList = new ArrayList<>(); + // for (Users users : usersList) { + // bookbuildingDoctorList.add(users.getId().toString()); + // } + // patientsQuery.setBookbuildingDoctorList(bookbuildingDoctorList); + // } + patientsQuery.setBookbuildingDoctor(StringUtils.isEmpty(patientManagerRequest.getBookbuildingDoctor()) ? null : patientManagerRequest.getBookbuildingDoctor()); patientsQuery.setProvinceId(StringUtils.isEmpty(patientManagerRequest.getProvinceId()) ? null : patientManagerRequest.getProvinceId()); patientsQuery.setCityId(StringUtils.isEmpty(patientManagerRequest.getCityId()) ? null : patientManagerRequest.getCityId()); patientsQuery.setAreaId(StringUtils.isEmpty(patientManagerRequest.getAreaId()) ? null : patientManagerRequest.getAreaId()); @@ -796,7 +795,7 @@ public class PatientFacade { // 什么都不做，这里是数据传入错误了 } } - patientsQuery.setName(StringUtils.isEmpty(patientManagerRequest.getQueryNo()) ? null : patientManagerRequest.getQueryNo()); + patientsQuery.setQueryNo(StringUtils.isEmpty(patientManagerRequest.getQueryNo()) ? null : patientManagerRequest.getQueryNo()); List patientsList = patientsService.queryPatient(patientsQuery); List patientManagerQueryModelList = new ArrayList<>(); -- 1.8.3.1